AmsSaleOrderController.java 22 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518
  1. package com.steerinfo.dil.controller;
  2. import com.steerinfo.dil.feign.ColumnDataFeign;
  3. import com.steerinfo.dil.feign.ESFeign;
  4. import com.steerinfo.dil.mapper.AmsDispatchSaleOrderMapper;
  5. import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
  6. import com.steerinfo.dil.model.AmsDispatchSaleOrder;
  7. import com.steerinfo.dil.model.AmsSaleOrder;
  8. import com.steerinfo.dil.model.AmsSaleOrderMaterial;
  9. import com.steerinfo.dil.service.IAmsSaleOrderService;
  10. import com.steerinfo.dil.service.impl.AmsDispatchSaleOrderServiceImpl;
  11. import com.steerinfo.dil.service.impl.AmsSaleOrderMaterialServiceImpl;
  12. import com.steerinfo.dil.util.BaseRESTfulController;
  13. import com.steerinfo.dil.util.ColumnDataUtil;
  14. import com.steerinfo.dil.util.DataChange;
  15. import com.steerinfo.dil.util.PageListAdd;
  16. import com.steerinfo.framework.controller.RESTfulResult;
  17. import com.steerinfo.framework.service.pagehelper.PageHelper;
  18. import io.swagger.annotations.ApiImplicitParam;
  19. import io.swagger.annotations.ApiImplicitParams;
  20. import io.swagger.annotations.ApiModelProperty;
  21. import io.swagger.annotations.ApiOperation;
  22. import org.springframework.beans.factory.annotation.Autowired;
  23. import org.springframework.web.bind.annotation.*;
  24. import java.math.BigDecimal;
  25. import java.text.ParseException;
  26. import java.util.Date;
  27. import java.util.HashMap;
  28. import java.util.List;
  29. import java.util.Map;
  30. /**
  31. * AmsSaleOrder RESTful接口:
  32. * @author generator
  33. * @version 1.0-SNAPSHORT 2021-09-06 07:10
  34. * 类描述
  35. * 修订历史:
  36. * 日期:2021-09-06
  37. * 作者:generator
  38. * 参考:
  39. * 描述:AmsSaleOrder RESTful接口
  40. * @see null
  41. * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  42. */
  43. @RestController
  44. @RequestMapping("/${api.version}/amssaleorders")
  45. public class AmsSaleOrderController extends BaseRESTfulController {
  46. @Autowired
  47. IAmsSaleOrderService amsSaleOrderService;
  48. @Autowired
  49. AmsSaleOrderMaterialServiceImpl amsSaleOrderMaterialService;
  50. @Autowired
  51. AmsDispatchSaleOrderServiceImpl amsDispatchSaleOrderService;
  52. @Autowired
  53. ColumnDataFeign columnDataFeign;
  54. @Autowired
  55. AmsDispatchSaleOrderMapper amsDispatchSaleOrderMapper;
  56. @Autowired
  57. ColumnDataUtil columnDataUtil;
  58. @Autowired
  59. ESFeign esFeign;
  60. @ApiOperation(value="查询未上报销售订单信息")
  61. @ApiImplicitParams({
  62. @ApiImplicitParam(name = "apiId(98)", value = "表头", required = false, dataType = "Interger")
  63. })
  64. @PostMapping("/getSaleOrderInfo")
  65. public RESTfulResult getSaleOrderInfo(@RequestBody(required=false) Map<String,Object> mapValue,
  66. Integer apiId,
  67. Integer pageNum,
  68. Integer pageSize){
  69. List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getSaleOrderInfo(mapValue);
  70. PageHelper.startPage(pageNum,pageSize);
  71. List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfo(mapValue);
  72. PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
  73. return success(pageList);
  74. }
  75. @ApiOperation(value="查询已上报销售订单信息")
  76. @ApiImplicitParams({
  77. @ApiImplicitParam(name = "apiId(98)", value = "表头", required = false, dataType = "Interger")
  78. })
  79. @PostMapping("/getSaleOrderReported")
  80. public RESTfulResult getSaleOrderReported(@RequestBody(required=false) Map<String,Object> mapValue,
  81. Integer apiId,
  82. Integer pageNum,
  83. Integer pageSize){
  84. List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getSaleOrderReported(mapValue);
  85. PageHelper.startPage(pageNum,pageSize);
  86. List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReported(mapValue);
  87. PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
  88. return success(pageList);
  89. }
  90. @ApiOperation(value="查询财务已审批销售订单信息")
  91. @ApiImplicitParams({
  92. @ApiImplicitParam(name = "apiId(105)", value = "表头", required = false, dataType = "Interger")
  93. })
  94. @PostMapping("/getAmsSaleOrderApproved")
  95. public RESTfulResult getAmsSaleOrderApproved(@RequestBody(required=false) Map<String,Object> mapValue,
  96. Integer apiId,
  97. Integer pageNum,
  98. Integer pageSize){
  99. List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getAmsSaleOrderApproved(mapValue);
  100. PageHelper.startPage(pageNum,pageSize);
  101. List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getAmsSaleOrderApproved(mapValue);
  102. PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
  103. return success(pageList);
  104. }
  105. @ApiOperation(value="根据销售订单号查询销售订单详细信息")
  106. @ApiImplicitParams({
  107. @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
  108. })
  109. @PostMapping("/getSaleOrderDetail")
  110. public RESTfulResult getSaleOrderDetail(BigDecimal saleOrderId,@RequestBody(required=false) Map<String,Object> mapValue,
  111. Integer apiId,
  112. Integer pageNum,
  113. Integer pageSize){
  114. if (mapValue == null) {
  115. mapValue = new HashMap<>();
  116. }
  117. mapValue.put("saleOrderId",saleOrderId);
  118. List<Map<String, Object>> amsSaleOrderDetail = amsSaleOrderService.getSaleOrderDetail(mapValue);
  119. PageHelper.startPage(pageNum,pageSize);
  120. List<Map<String, Object>> amsSaleOrderDetail1 = amsSaleOrderService.getSaleOrderDetail(mapValue);
  121. PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrderDetail,amsSaleOrderDetail1);
  122. return success(pageList);
  123. }
  124. /**
  125. * 上传销售订单
  126. * @param saleOrderId
  127. * @return
  128. */
  129. @ApiOperation(value="上传销售订单")
  130. @ApiImplicitParams({
  131. @ApiImplicitParam(name = "saleOrderId", value = "销售订单ID", required = false, dataType = "java.math.BigDecimal")
  132. })
  133. @PostMapping(value = "/uploadSaleOrder")
  134. public RESTfulResult uploadSaleOrder(@RequestParam BigDecimal saleOrderId){
  135. int i = amsSaleOrderService.uploadSaleOrder(saleOrderId);
  136. return success(i);
  137. }
  138. /**
  139. * 新增销售订单
  140. * @param map
  141. * @return
  142. */
  143. @ApiOperation(value="新增销售订单")
  144. @ApiImplicitParams({
  145. @ApiImplicitParam(name = "amsSaleOrder", value = "销售订单对象", required = false, dataType = "AmsSaleOrder")
  146. })
  147. @PostMapping(value = "/addAmsSaleOrder")
  148. public RESTfulResult addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
  149. int i = amsSaleOrderService.addAmsSaleOrder(map);
  150. return success(i);
  151. }
  152. /**
  153. * 通过主键渲染销售订单信息
  154. * @param saleOrderId
  155. * @return
  156. */
  157. @ApiOperation(value="通过主键渲染销售订单信息")
  158. @ApiImplicitParams({
  159. @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
  160. })
  161. @PostMapping(value = "/getAmsSaleOrderBySaleOrderId")
  162. public RESTfulResult getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId){
  163. Map<String, Object> maps = amsSaleOrderService.selectInfoBySaleOrderId(saleOrderId);
  164. List<Map<String, Object>> maps1= amsSaleOrderService.selectMaterialInfoBySaleOrderId(saleOrderId);
  165. Map map=new HashMap();
  166. map.put("maps",maps);
  167. map.put("maps1",maps1);
  168. return success(map);
  169. }
  170. /**steelMaterialId
  171. * 通过主键修改销售订单
  172. * @param map
  173. * @return
  174. */
  175. @ApiOperation(value="通过主键修改销售订单")
  176. @ApiImplicitParams({
  177. @ApiImplicitParam(name = "amsSaleOrder", value = "销售订单对象", required = false, dataType = "AmsSaleOrder")
  178. })
  179. @PostMapping(value = "/updateAmsSaleOrder")
  180. public RESTfulResult updateAmsSaleOrder(@RequestBody(required = false) Map<String,Object> map) throws ParseException {
  181. int i = amsSaleOrderService.updateAmsSaleOrder(map);
  182. return success(i);
  183. }
  184. /**
  185. * 通过主键删除销售订单
  186. * @param saleOrderId
  187. * @return
  188. */
  189. @ApiOperation(value="通过主键删除销售订单")
  190. @ApiImplicitParams({
  191. @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
  192. })
  193. @PostMapping(value = "/deleteAmsSaleOrderBySaleOrderId")
  194. public RESTfulResult deleteAmsSaleOrderBySaleOrderId(BigDecimal saleOrderId){
  195. int i = amsSaleOrderService.deleteAmsSaleOrderBySaleOrderId(saleOrderId);
  196. return success(i);
  197. }
  198. @ApiOperation(value="根据销售订单号查询销售订单修改日志")
  199. @ApiImplicitParams({
  200. @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
  201. })
  202. @PostMapping("/getSaleOrderUpdateLog")
  203. public RESTfulResult getSaleOrderUpdateLog(BigDecimal saleOrderId,@RequestBody(required=false) Map<String,Object> mapValue,
  204. Integer apiId,
  205. Integer pageNum,
  206. Integer pageSize){
  207. if (mapValue == null) {
  208. mapValue = new HashMap<>();
  209. }
  210. mapValue.put("saleOrderId",saleOrderId);
  211. List<Map<String, Object>> amsSaleOrderUpdate = amsSaleOrderService.getSaleOrderUpdateLog(mapValue);
  212. PageHelper.startPage(pageNum,pageSize);
  213. List<Map<String, Object>> amsSaleOrderUpdate1 = amsSaleOrderService.getSaleOrderUpdateLog(mapValue);
  214. PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrderUpdate,amsSaleOrderUpdate1);
  215. return success(pageList);
  216. }
  217. /**
  218. * 获取销售计划名称
  219. * @param
  220. * @return
  221. */
  222. @ApiOperation(value="获取销售计划名称")
  223. @ApiImplicitParams({
  224. })
  225. @GetMapping(value = "/getSalePlanName")
  226. public RESTfulResult getSalePlanName(){
  227. return success(amsSaleOrderService.getSalePlanName());
  228. }
  229. /**
  230. * 获取发货单位
  231. * @param
  232. * @return
  233. */
  234. @ApiOperation(value="获取发货单位")
  235. @ApiImplicitParams({
  236. })
  237. @GetMapping(value = "/getShipperName")
  238. public RESTfulResult getShipperName(){
  239. return success(amsSaleOrderService.getShipperName());
  240. }
  241. /**
  242. * 获取收货单位
  243. * @param
  244. * @return
  245. */
  246. @ApiOperation(value="获取收货单位")
  247. @ApiImplicitParams({
  248. })
  249. @GetMapping(value = "/getConsigneeCompanyName")
  250. public RESTfulResult getConsigneeCompanyName(){
  251. return success(amsSaleOrderService.getConsigneeCompanyName());
  252. }
  253. /**
  254. * 展示销售公司已审核销售订单的车序号列表
  255. * @param mapValue
  256. * @param pageNum
  257. * @param pageSize
  258. * @param apiId
  259. * @return
  260. */
  261. @ApiModelProperty(value = "展示销售公司已审核销售订单的车序号列表")
  262. @ApiImplicitParams({
  263. @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
  264. @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
  265. @ApiImplicitParam(name = "apiId", value = "181", required = false, dataType = "BigDecimal")
  266. })
  267. @PostMapping("/getSaleOrderList")
  268. public RESTfulResult getSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
  269. Integer pageNum,
  270. Integer pageSize,
  271. Integer apiId,
  272. Integer status,
  273. String con) {
  274. int count=0;
  275. if (status!=null){
  276. mapValue.put("status",status);
  277. count++;
  278. }
  279. if(con != null){
  280. if(!"undefined".equals(con)){
  281. String index="get_sale_orderlist";//设置要查询的索引名称
  282. return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
  283. }
  284. }
  285. //不分页筛选数据
  286. List<Map<String, Object>> allSaleOrderList = null;
  287. //如果有条件查询则跳过初始化,和创建索引
  288. if(mapValue.size() == count){
  289. //将查询结果存入索引中
  290. allSaleOrderList = amsSaleOrderService.getSaleOrderList(mapValue);
  291. Map<String, Object> map1 = new HashMap<>();
  292. //添加索引
  293. map1.put("index","get_sale_orderlist");
  294. //添加id
  295. map1.put("indexId","saleOrderId");
  296. allSaleOrderList.add(map1);
  297. //新建索引
  298. esFeign.insertIndex(allSaleOrderList);
  299. //删除
  300. allSaleOrderList.remove(allSaleOrderList.size()-1);
  301. }
  302. if(allSaleOrderList== null)
  303. allSaleOrderList = amsSaleOrderService.getSaleOrderList(mapValue);
  304. PageHelper.startPage(pageNum,pageSize);
  305. //分页数据
  306. List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderList(mapValue);
  307. PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderList,saleOrderList);
  308. return success(pageList);
  309. }
  310. /**
  311. * 销售公司查询已审核的订单
  312. *
  313. */
  314. @ApiModelProperty(value = "展示销售公司已审核销售订单的车序号列表")
  315. @ApiImplicitParams({
  316. @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
  317. @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
  318. @ApiImplicitParam(name = "apiId", value = "181", required = false, dataType = "BigDecimal")
  319. })
  320. @PostMapping("/getSaleOrderListBySaleCompany")
  321. public RESTfulResult getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
  322. Integer pageNum,
  323. Integer pageSize,
  324. Integer apiId,
  325. String con) {
  326. if(con != null){
  327. if(!"undefined".equals(con)){
  328. String index="get_sale_companylist";//设置要查询的索引名称
  329. return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
  330. }
  331. }
  332. //不分页筛选数据
  333. List<Map<String, Object>> saleCompanyList = null;
  334. //如果有条件查询则跳过初始化,和创建索引
  335. if(mapValue.size() == 0){
  336. //将查询结果存入索引中
  337. saleCompanyList = amsSaleOrderService.getSaleOrderListBySaleCompany(mapValue);
  338. Map<String, Object> map1 = new HashMap<>();
  339. //添加索引
  340. map1.put("index","get_sale_orderlist");
  341. //添加id
  342. map1.put("indexId","saleOrderId");
  343. saleCompanyList.add(map1);
  344. //新建索引
  345. esFeign.insertIndex(saleCompanyList);
  346. //删除
  347. saleCompanyList.remove(saleCompanyList.size()-1);
  348. }
  349. if(saleCompanyList== null)
  350. saleCompanyList = amsSaleOrderService.getSaleOrderListBySaleCompany(mapValue);
  351. PageHelper.startPage(pageNum,pageSize);
  352. //分页数据
  353. List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListBySaleCompany(mapValue);
  354. PageListAdd pageList = columnDataUtil.tableColumnData(apiId, saleCompanyList,saleOrderList);
  355. return success(pageList);
  356. }
  357. /**
  358. * 固定派单:通过车序号查询收货地址,截取收货地址的区域,去资源管理中查询对应的承运商,将车序号与承运商绑定
  359. */
  360. @PostMapping("/addAmsDispatchSaleOrder")
  361. public RESTfulResult addAmsDispatchSaleOrder(@RequestBody(required = false) List<Map<String,Object>> mapValue){
  362. if(mapValue==null){
  363. return failed();
  364. }
  365. for (Map<String,Object> m:mapValue
  366. ) {
  367. Integer id = Integer.parseInt(m.get("saleOrderMaterialId").toString()) ;
  368. System.out.println(id);
  369. //通过主键Id获取地址id
  370. Integer a=amsSaleOrderMaterialService.selectById(new BigDecimal(id));
  371. //通过地址id查询承运商id
  372. List<Integer> carriers = amsSaleOrderService.getCarrier(a);
  373. //判断是否只有一个承运商
  374. //如果收货地区为成都重庆,则有多个一个地区对应多个承运商
  375. if(carriers.size()==1) {
  376. //新增固定派单
  377. AmsDispatchSaleOrder ad = new AmsDispatchSaleOrder();
  378. ad.setDispatchId(DataChange.dataToBigDecimal(m.get("dispatchId")));
  379. ad.setSaleOrderMaterialId(new BigDecimal(id));
  380. ad.setCarrierId(new BigDecimal(carriers.get(0)));
  381. ad.setDispatchDealTime(new Date());
  382. ad.setDispatchTime(new Date());
  383. //成交类型(0:定向派单;1:公开抢单)
  384. ad.setDispatchType(new BigDecimal(0));
  385. //销售订单车序号状态(0:已下发;1:未下发)
  386. ad.setDispatchStatus(new BigDecimal(0));
  387. int i = amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(ad);
  388. return success(i);
  389. }
  390. }
  391. return success();
  392. }
  393. /**
  394. * 公开派单:查询未分派车辆的销售订单的车序号
  395. */
  396. @ApiModelProperty(value = "展示车序号列表")
  397. @ApiImplicitParams({
  398. @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
  399. @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
  400. @ApiImplicitParam(name = "apiId", value = "182", required = false, dataType = "BigDecimal")
  401. })
  402. @PostMapping("/getAmsSaleOrderMaterial")
  403. public RESTfulResult getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> mapValue,
  404. Integer pageNum,
  405. Integer pageSize,
  406. Integer apiId,
  407. Integer status) {
  408. mapValue.put("status",status);
  409. List<Map<String, Object>> list = amsSaleOrderMaterialService.getSaleMaterial(mapValue);
  410. PageHelper.startPage(pageNum, pageSize);
  411. //分页查询数据
  412. List<Map<String, Object>> columnList = amsSaleOrderMaterialService.getSaleMaterial(mapValue);
  413. PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
  414. return success(data);
  415. }
  416. /**
  417. * 公开派单:新增公开派单
  418. */
  419. @PostMapping("/addOpenAmsDispatchSaleOrder/{orderMaterialId}")
  420. public RESTfulResult addOpenAmsDispatchSaleOrder(@PathVariable("orderMaterialId") BigDecimal orderMaterialId){
  421. if(orderMaterialId==null){
  422. return failed();
  423. }
  424. //新增公开派单
  425. AmsDispatchSaleOrder ad = new AmsDispatchSaleOrder();
  426. Integer id = amsDispatchSaleOrderMapper.selectDispatchIdBySaleOrderMaterialId(orderMaterialId.intValue());
  427. ad.setDispatchId(DataChange.dataToBigDecimal(id));
  428. ad.setSaleOrderMaterialId(orderMaterialId);
  429. //成交类型(0:定向派单;1:公开抢单)
  430. ad.setDispatchType(new BigDecimal(1));
  431. //销售订单车序号状态(0:已下发;1:未下发)
  432. ad.setDispatchStatus(new BigDecimal(1));
  433. //更新公开派单状态
  434. amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(ad);
  435. return success("更新成功");
  436. }
  437. /**
  438. * 删除公开派单
  439. */
  440. @PostMapping("/deleteAmsDispatchSaleOrder/{dispatchId}")
  441. public RESTfulResult deleteAmsDispatchSaleOrder(@PathVariable("dispatchId") BigDecimal dispatchId) {
  442. amsDispatchSaleOrderService.delete(dispatchId);
  443. return success("删除成功");
  444. }
  445. /**
  446. * 公开派单:查询公开派单
  447. */
  448. @ApiModelProperty(value = "展示公开派单")
  449. @ApiImplicitParams({
  450. @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
  451. @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
  452. @ApiImplicitParam(name = "apiId", value = "181", required = false, dataType = "BigDecimal")
  453. })
  454. @PostMapping("/getOpenDispatchSaleOrder")
  455. public RESTfulResult getOpenDispatchSaleOrder(@RequestBody(required = false) Map<String,Object> mapValue,
  456. Integer pageNum,
  457. Integer pageSize,
  458. Integer apiId) {
  459. List<Map<String, Object>> list = amsDispatchSaleOrderService.getOpenDispatchSaleOrder(mapValue);
  460. PageHelper.startPage(pageNum, pageSize);
  461. //分页查询数据
  462. List<Map<String, Object>> columnList = amsDispatchSaleOrderService.getOpenDispatchSaleOrder(mapValue);
  463. PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
  464. return success(data);
  465. }
  466. /**
  467. *公开派单:修改公开派单
  468. */
  469. @PostMapping("/updateOpenDispatchSaleOrder")
  470. public RESTfulResult updateOpenDispatchSaleOrder(@RequestBody AmsDispatchSaleOrder amsDispatchSaleOrder) {
  471. if(amsDispatchSaleOrder.getCarrierId()!=null){
  472. amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(1));
  473. }
  474. amsDispatchSaleOrder.setDispatchDealTime(new Date());
  475. amsDispatchSaleOrder.setUpdateTime(new Date());
  476. amsDispatchSaleOrder.setUpdateUsername("admin");
  477. amsDispatchSaleOrderService.modify(amsDispatchSaleOrder);
  478. return success("修改成功");
  479. }
  480. }