WMSController.java 30 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779
  1. package com.steerinfo.dil.controller;
  2. import com.steerinfo.dil.feign.QMSFeign;
  3. import com.steerinfo.dil.feign.QmsTruckFeign;
  4. import com.steerinfo.dil.feign.WMSFeign;
  5. import com.steerinfo.dil.util.BaseRESTfulController;
  6. import com.steerinfo.framework.controller.RESTfulResult;
  7. import io.swagger.annotations.ApiImplicitParam;
  8. import io.swagger.annotations.ApiImplicitParams;
  9. import io.swagger.annotations.ApiOperation;
  10. import org.springframework.beans.factory.annotation.Autowired;
  11. import org.springframework.transaction.annotation.Transactional;
  12. import org.springframework.web.bind.annotation.*;
  13. import java.math.BigDecimal;
  14. import java.util.Date;
  15. import java.util.HashMap;
  16. import java.util.List;
  17. import java.util.Map;
  18. /**
  19. * @author luobang
  20. * @create 2021-09-17 14:09
  21. */
  22. @RestController
  23. @RequestMapping("${api.version}/wms")
  24. public class WMSController extends BaseRESTfulController {
  25. @Autowired
  26. WMSFeign wmsFeign;
  27. @Autowired
  28. QMSFeign qmsFeign;
  29. @PostMapping("getWmsInboundResult")
  30. @ApiOperation(value = "展示入库实绩信息")
  31. @ApiImplicitParams({
  32. @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
  33. })
  34. public Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
  35. Integer apiId,
  36. Integer pageNum,
  37. Integer pageSize,
  38. String con) {
  39. return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
  40. }
  41. @PostMapping("getWmspOutboundResult")
  42. @ApiOperation(value = "展示出库实绩信息")
  43. @ApiImplicitParams({
  44. @ApiImplicitParam(name = "apiId", value = "152", required = false, dataType = "BigDecimal"),
  45. })
  46. public Map<String, Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
  47. Integer pageNum,
  48. Integer pageSize,
  49. Integer apiId,
  50. String con) {
  51. return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
  52. }
  53. @PostMapping("/insertWmspOutBoundResult")
  54. @ApiOperation(value = "新增出单实绩并返回出库单详情")
  55. public Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval) {
  56. Map<String, Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
  57. return resTfulResult;
  58. }
  59. @PostMapping(value = "/deletewmspOutboundResult")
  60. public Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId){
  61. return wmsFeign.deleteWmspOutboundResult(resultId);
  62. }
  63. @PostMapping("/insertwmspOutboundScanResult")
  64. public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
  65. Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
  66. return resTfulResult;
  67. }
  68. @PostMapping("/outbountResultToSuccess")
  69. public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
  70. return wmsFeign.outbountResultToSuccess(resultId);
  71. }
  72. @PostMapping("/updataResultStatus")
  73. public Map<String, Object> updataResultStatus(@RequestParam Integer resultId) {
  74. Map<String, Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
  75. return resTfulResult;
  76. }
  77. @PostMapping("/getRmsMaterial")
  78. public Map<String, Object> getRmsMaterial(@RequestBody(required = false) Map<String, Object> mapval) {
  79. Map<String, Object> resTfulResult = wmsFeign.getRmsMaterial(mapval);
  80. return resTfulResult;
  81. }
  82. //查询实时库存数据
  83. @PostMapping("/selectGridMaterialList")
  84. @ApiOperation(value = "展示实时库存数据")
  85. @ApiImplicitParams({
  86. @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
  87. })
  88. public Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
  89. Integer pageNum,
  90. Integer pageSize,
  91. Integer apiId,
  92. String con) {
  93. return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
  94. }
  95. //通过成品仓库网格ID查询实时库存数据
  96. @PostMapping("/selectGridMaterialListByGridId")
  97. @ApiOperation(value = "通过成品仓库网格ID展示实时库存数据")
  98. @ApiImplicitParams({
  99. @ApiImplicitParam(name = "apiId", value = "155", required = false, dataType = "BigDecimal"),
  100. })
  101. public Map<String,Object> selectGridMaterialListByGridId(BigDecimal gridId) {
  102. return wmsFeign.selectGridMaterialListByGridId(gridId);
  103. }
  104. //修改物资钢材表的质量是否合格字段和逻辑删除
  105. @PostMapping(value = "/updateRmsMaterialSteelDemotion")
  106. public Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map){
  107. return wmsFeign.updateRmsMaterialSteelDemotion(map);
  108. }
  109. //钢材异地库出库扫描
  110. @PostMapping("/OutScanResultTag")
  111. public Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> mapval) {
  112. Map<String, Object> resTfulResult = wmsFeign.OutScanResultTag(mapval);
  113. return resTfulResult;
  114. }
  115. //钢材异地库出库展示实绩
  116. @PostMapping("/getWmsOffsiteLibaryOutboundList")
  117. @ApiOperation(value = "展示实时库存数据")
  118. @ApiImplicitParams({
  119. @ApiImplicitParam(name = "apiId", value = "164", required = false, dataType = "BigDecimal"),
  120. })
  121. public Map<String, Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String, Object> mapVal,
  122. Integer pageNum,
  123. Integer pageSize,
  124. Integer apiId,
  125. String con) {
  126. return wmsFeign.getWmsOffsiteLibaryOutboundList(mapVal == null ? new HashMap<>() : mapVal, pageNum, pageSize, apiId, con);
  127. }
  128. //展示钢材扫描入库实绩列表
  129. @ApiImplicitParams({
  130. @ApiImplicitParam(name = "apiId", value = "165", required = false, dataType = "BigDecimal"),
  131. })
  132. @PostMapping("/getWmsOffsiteLibaryInboundList")
  133. public Map<String, Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> map,
  134. Integer pageNum,
  135. Integer pageSize,
  136. Integer apiId,
  137. String con) {
  138. return wmsFeign.getWmsOffsiteLibaryInboundList(map == null ? new HashMap<>() : map, pageNum, pageSize, apiId, con);
  139. }
  140. //钢材异地库扫描入库
  141. @PostMapping("/ScanResultTag")
  142. public Map<String, Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String, Object> map) {
  143. Map<String, Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
  144. return resTfulResult;
  145. }
  146. //获取扫描实绩
  147. @PostMapping("/getScanResult")
  148. public Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map) {
  149. Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
  150. return resTfulResult;
  151. }
  152. //更新状态
  153. @PostMapping("/updateStatus")
  154. public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {
  155. Map<String, Object> resTfulResult = wmsFeign.updateStatus(map);
  156. return resTfulResult;
  157. }
  158. //展示在途库存数据
  159. @ApiImplicitParams({
  160. @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
  161. })
  162. @PostMapping("/getWmspIntransitInventory")
  163. public Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
  164. Integer pageNum,
  165. Integer pageSize,
  166. Integer apiId,
  167. String con) {
  168. return wmsFeign.getWmspIntransitInventory(mapVal == null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
  169. }
  170. //新增倒库出库实绩
  171. @PostMapping("/insertOutBoundResult")
  172. public Map<String, Object> insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map) {
  173. Map<String, Object> resTfulResult = wmsFeign.insertOutBoundResult(map);
  174. return resTfulResult;
  175. }
  176. //新增倒库出库扫描实绩
  177. @PostMapping("/AddWmspOutboundScanResult")
  178. public Map<String, Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapVal) {
  179. Map<String, Object> resTfulResult = wmsFeign.AddWmspOutboundScanResult(mapVal);
  180. return resTfulResult;
  181. }
  182. //通过下拉框筛选数据
  183. @ApiImplicitParams({
  184. @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
  185. })
  186. @PostMapping("/getWmspRestackMakeResultList")
  187. public Map<String, Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
  188. Integer pageNum,
  189. Integer pageSize,
  190. Integer apiId,
  191. Integer warehouseid,
  192. Integer stackingId,
  193. Integer gradtionNumber) {
  194. return wmsFeign.getWmspRestackMakeResultList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
  195. }
  196. @PostMapping(value = "/addRestackMakeResult")
  197. public Map<String,Object> addRestackMakeResult(@RequestBody Map<String,Object> mapval){
  198. return wmsFeign.addRestackMakeResult(mapval);
  199. }
  200. //删除倒垛单
  201. @PostMapping("/deleteByResultId/{resultId}")
  202. public Map<String, Object> deleteByResultId(@PathVariable Integer resultId) {
  203. Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
  204. return resTfulResult;
  205. }
  206. //下发倒垛单
  207. @PostMapping("/dispatchDistrubtionStatus/{resultId}")
  208. public Map<String, Object> dispatchDistrubtionStatus(@PathVariable Integer resultId) {
  209. Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
  210. return resTfulResult;
  211. }
  212. //下拉框获取层次
  213. @GetMapping("/selectGardationNumber")
  214. public Map<String, Object> selectGardationNumber(Integer warehouseid, Integer stackingId) {
  215. Map<String, Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid, stackingId);
  216. return resTfulResult;
  217. }
  218. //下拉框获取仓库名称
  219. @GetMapping("/selectWarehouse")
  220. public Map<String, Object> selectWarehouse() {
  221. Map<String, Object> resTfulResult = wmsFeign.selectWarehouse();
  222. return resTfulResult;
  223. }
  224. //下拉框获取仓库名称
  225. @GetMapping("/selectStackingId")
  226. public Map<String, Object> selectStackingId(Integer warehouseid) {
  227. Map<String, Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
  228. return resTfulResult;
  229. }
  230. //展示倒垛单
  231. @ApiImplicitParams({
  232. @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
  233. })
  234. @PostMapping("/selectRestackList")
  235. public Map<String, Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
  236. Integer pageNum,
  237. Integer pageSize,
  238. Integer apiId,
  239. Integer DistrubtionStatus) {
  240. return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
  241. }
  242. @PostMapping("/editRestackMakeResult")
  243. public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
  244. Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
  245. return resTfulResult;
  246. }
  247. //渲染倒垛后的仓库信息
  248. @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
  249. public Map<String, Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId) {
  250. Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
  251. return resTfulResult;
  252. }
  253. //渲染倒垛后的垛位信息
  254. @PostMapping("/selectAfterstackingByResultId/{resultId}")
  255. public Map<String, Object> selectAfterstackingByResultId(@PathVariable Integer resultId) {
  256. Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
  257. return resTfulResult;
  258. }
  259. //PDA展示倒垛单
  260. @PostMapping("/selectRestackForPDA")
  261. public Map<String, Object> selectRestackForPDA(@RequestBody(required = false) Map<String, Object> map) {
  262. Map<String, Object> resTfulResult = wmsFeign.selectRestackForPDA(map);
  263. return resTfulResult;
  264. }
  265. //PDA根据实绩id查找物资信息
  266. @PostMapping("/selectMaterialInfoByResultId")
  267. public Map<String, Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String, Object> map) {
  268. Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
  269. return resTfulResult;
  270. }
  271. <<<<<<< HEAD
  272. @ApiImplicitParams({
  273. @ApiImplicitParam(value = "395",name = "apiId")
  274. })
  275. =======
  276. @ApiImplicitParams({
  277. @ApiImplicitParam(value = "395",name = "apiId")
  278. })
  279. >>>>>>> dev
  280. @PostMapping(value = "/getRestackInfoByResultId")
  281. public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
  282. Integer pageNum,
  283. Integer pageSize,
  284. Integer apiId
  285. ){
  286. return wmsFeign.getRestackInfoByResultId(mapVal==null?new HashMap<>():mapVal, pageNum, pageSize, apiId);
  287. }
  288. //PDA根据仓库id查找倒垛单
  289. @PostMapping("/selectRestackByWarehouseId")
  290. public Map<String, Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String, Object> map) {
  291. Map<String, Object> resTfulResult = wmsFeign.selectRestackByWarehouseId(map);
  292. return resTfulResult;
  293. }
  294. //扫描吊牌添加扫描实绩
  295. @PostMapping("/ScanTagResult")
  296. public Map<String, Object> ScanTagResult(@RequestBody(required = false) Map<String, Object> mal) {
  297. Map<String, Object> resTfulResult = wmsFeign.ScanTagResult(mal);
  298. return resTfulResult;
  299. }
  300. //下发
  301. @PostMapping("/Issue")
  302. public Map<String, Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  303. Map<String, Object> resTfulResult = wmsFeign.Issue(mapList);
  304. return resTfulResult;
  305. }
  306. /**
  307. * 2.展示退库实绩信息
  308. *
  309. * @param mapValue
  310. * @param apiId
  311. * @param pageNum
  312. * @param pageSize
  313. * @return
  314. */
  315. @PostMapping("/getWmsReboundResult")
  316. @ApiOperation(value = "展示退库实绩信息")
  317. @ApiImplicitParams({
  318. @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
  319. })
  320. public RESTfulResult getWmsReboundResult(Map<String, Object> mapValue,
  321. Integer apiId,
  322. Integer pageNum,
  323. Integer pageSize,
  324. String con) {
  325. return wmsFeign.getWmsReboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
  326. }
  327. @PostMapping("/selectScanResultByIboundResultId")
  328. @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
  329. @ApiImplicitParams({
  330. @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
  331. })
  332. public RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
  333. <<<<<<< HEAD
  334. Integer apiId,
  335. Integer pageNum,
  336. Integer pageSize,
  337. Integer inboundId
  338. ) {
  339. =======
  340. Integer apiId,
  341. Integer pageNum,
  342. Integer pageSize,
  343. Integer inboundId
  344. ) {
  345. >>>>>>> dev
  346. return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
  347. }
  348. //根据物资信息获取原来垛位信息
  349. @PostMapping("/selectInfoByMaterialCode")
  350. public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
  351. if (mal == null) {
  352. mal = new HashMap<>();
  353. }
  354. return wmsFeign.selectInfoByMaterialCode(mal);
  355. }
  356. //根据仓库查询未接收的垛位
  357. @PostMapping("/selectStackingInfoByWarehouseId")
  358. public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
  359. if (mal == null) {
  360. mal = new HashMap<>();
  361. }
  362. return wmsFeign.selectStackingInfoByWarehouseId(mal);
  363. }
  364. @PostMapping("/getWmsIvboundResult")
  365. @ApiOperation(value = "展示倒库实绩信息")
  366. @ApiImplicitParams({
  367. @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
  368. })
  369. public RESTfulResult getWmsIvboundResult(Map<String, Object> mapValue,
  370. Integer apiId,
  371. Integer pageNum,
  372. Integer pageSize) {
  373. return wmsFeign.getWmsIvboundResult(mapValue, apiId, pageNum, pageSize);
  374. }
  375. /**
  376. * 展示倒库物资实绩
  377. *
  378. * @param mapValue
  379. * @param apiId
  380. * @param pageNum
  381. * @param pageSize
  382. * @return
  383. */
  384. @PostMapping("/getWmsIvboundMaterialt")
  385. @ApiOperation(value = "展示倒库物资实绩")
  386. @ApiImplicitParams({
  387. @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
  388. })
  389. public RESTfulResult getWmsIvboundMaterial(Map<String, Object> mapValue,
  390. Integer apiId,
  391. Integer pageNum,
  392. Integer pageSize) {
  393. return wmsFeign.getWmsIvboundMaterial(mapValue, apiId, pageNum, pageSize);
  394. }
  395. @PostMapping("/getInventoryCheck")
  396. @ApiOperation(value = "展示库存盘点实绩")
  397. @ApiImplicitParams({
  398. @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
  399. })
  400. public RESTfulResult getInventoryCheck(Map<String, Object> mapValue,
  401. Integer apiId,
  402. Integer pageNum,
  403. Integer pageSize,
  404. String con) {
  405. return wmsFeign.getInventoryCheck(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
  406. }
  407. @PostMapping("/getInventoryClose")
  408. @ApiOperation(value = "展示库存结转实绩")
  409. @ApiImplicitParams({
  410. @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
  411. })
  412. public RESTfulResult getInventoryClose(Map<String, Object> mapValue,
  413. Integer apiId,
  414. Integer pageNum,
  415. Integer pageSize,
  416. String con) {
  417. return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
  418. }
  419. @PostMapping("/getSendReceive")
  420. @ApiOperation(value = "展示收发存实绩")
  421. @ApiImplicitParams({
  422. @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
  423. })
  424. public RESTfulResult getSendReceive(Map<String, Object> mapValue,
  425. Integer apiId,
  426. Integer pageNum,
  427. Integer pageSize,
  428. String con) {
  429. return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
  430. }
  431. /**
  432. * 展示未下发吊钢工扫描吊牌实绩
  433. *
  434. * @return
  435. */
  436. @ApiOperation(value = "展示未下发吊钢工扫描吊牌实绩")
  437. @PostMapping("/getTagResult")
  438. public Map<String, Object> getTagResult() {
  439. return wmsFeign.getTagResult();
  440. }
  441. /**
  442. * 展示正常入库吊钢工扫描吊牌实绩
  443. *
  444. * @return
  445. */
  446. @ApiOperation(value = "展示正常入库吊钢工扫描吊牌实绩")
  447. @PostMapping("/getIssuedTagResult")
  448. public Map getIssuedTagResult() {
  449. return wmsFeign.getIssuedTagResult();
  450. }
  451. /**
  452. * 展示异常入库吊钢工扫描吊牌实绩
  453. *
  454. * @return
  455. */
  456. @ApiOperation(value = "展示异常入库吊钢工扫描吊牌实绩")
  457. @PostMapping("/getIssuedTagNoResult")
  458. public Map getIssuedTagNoResult() {
  459. return wmsFeign.getIssuedTagNoResult();
  460. }
  461. /**
  462. * 展示已退库吊钢工扫描吊牌实绩
  463. *
  464. * @return
  465. */
  466. @ApiOperation(value = "展示已退库吊钢工扫描吊牌实绩")
  467. @PostMapping("/getReIssuedResult")
  468. public Map getReIssuedResult() {
  469. return wmsFeign.getIssuedResult();
  470. }
  471. /**
  472. * 展示未下发退库吊钢工扫描吊牌实绩
  473. *
  474. * @return
  475. */
  476. @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
  477. @PostMapping("/getReTagResult")
  478. public Map getReTagResult() {
  479. return wmsFeign.getReTagResult();
  480. }
  481. /**
  482. * 展示已倒库入库吊钢工扫描吊牌实绩
  483. *
  484. * @return
  485. */
  486. @ApiOperation(value = "展示已倒库入库吊钢工扫描吊牌实绩")
  487. @PostMapping("/getIvIssuedResult")
  488. public Map getIvIssuedResult() {
  489. return wmsFeign.getIvIssuedResult();
  490. }
  491. /**
  492. * 展示未下发退库吊钢工扫描吊牌实绩
  493. *
  494. * @return
  495. */
  496. @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
  497. @PostMapping("/getIvTagResult")
  498. public Map getIvTagResult() {
  499. return wmsFeign.getIvTagResult();
  500. }
  501. /**
  502. * 新增入库实绩
  503. *
  504. * @param mapList
  505. * @return
  506. */
  507. @ApiOperation("新增入库实绩")
  508. @PostMapping("/insertInboundResult")
  509. @Transactional
  510. public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
  511. return wmsFeign.insertInboundResult(mapList);
  512. }
  513. /**
  514. * 新增退库实绩
  515. *
  516. * @param mapList
  517. * @return
  518. */
  519. @ApiOperation("新增退库实绩")
  520. @PostMapping("/insertReboundResult")
  521. @Transactional
  522. public String addReboundResult(@RequestBody List<Map<String, Object>> mapList) {
  523. /*
  524. 获取入库物资件数
  525. */
  526. int size = mapList.size();
  527. /*
  528. 获取入库垛位
  529. */
  530. Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
  531. String stackNo = (String) map1.get("stackNo");
  532. BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
  533. for (Map<String, Object> map : mapList
  534. ) {
  535. map.put("stackingId", stackId);
  536. }
  537. wmsFeign.insertReboundResult(mapList);
  538. return stackNo;
  539. }
  540. /**
  541. * 新增倒库入库实绩
  542. *
  543. * @param mapList
  544. * @return
  545. */
  546. @ApiOperation("新增倒库入库实绩")
  547. @PostMapping("/insertIvboundResult")
  548. @Transactional
  549. public String addIvboundResult(@RequestBody List<Map<String, Object>> mapList) {
  550. /*
  551. 获取入库物资件数
  552. */
  553. int size = mapList.size();
  554. /*
  555. 获取入库垛位
  556. */
  557. Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
  558. String stackNo = (String) map1.get("stackNo");
  559. BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
  560. for (Map<String, Object> map : mapList
  561. ) {
  562. map.put("stackingId", stackId);
  563. }
  564. wmsFeign.insertIvboundResult(mapList);
  565. return stackNo;
  566. }
  567. /**
  568. * 展示入库垛位
  569. *
  570. * @param DriverId
  571. * @return
  572. */
  573. @PostMapping("/getInboundStack")
  574. @ApiOperation(value = "展示入库垛位")
  575. public Integer getInboundStack(Integer DriverId) {
  576. return wmsFeign.getInboundStack(DriverId);
  577. }
  578. /**
  579. * 新增库存盘点
  580. *
  581. * @param map
  582. * @return
  583. */
  584. @PostMapping("/inventoryCheck")
  585. @ApiOperation(value = "新增库存盘点")
  586. public Map<String, Object> inventoryCheck(@RequestBody(required = false) Map<String, Object> map) {
  587. return wmsFeign.inventoryCheck(map);
  588. }
  589. /**
  590. * 新增入库扫描吊牌实绩
  591. *
  592. * @param map
  593. * @return
  594. */
  595. @ApiOperation(value = "新增入库扫描吊牌实绩")
  596. @PostMapping("/insertResult")
  597. @Transactional
  598. public Map<String, Object> insertResult(@RequestBody(required = false) Map<String, Object> map) {
  599. return wmsFeign.insertResult(map);
  600. }
  601. /**
  602. * 新增退库扫描吊牌实绩
  603. *
  604. * @param map
  605. * @return
  606. */
  607. @ApiOperation(value = "新增退库扫描吊牌实绩")
  608. @PostMapping("/insertReboundScanResult")
  609. @Transactional
  610. public Map<String, Object> insertReboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
  611. return wmsFeign.insertReboundScanResult(map);
  612. }
  613. /**
  614. * 新增倒库入库扫描吊牌实绩
  615. *
  616. * @param map
  617. * @return
  618. */
  619. @ApiOperation(value = "新增倒库入库扫描吊牌实绩")
  620. @PostMapping("/insertIvboundScanResult")
  621. @Transactional
  622. public Map<String, Object> insertIvboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
  623. return wmsFeign.insertIvboundScanResult(map);
  624. }
  625. /**
  626. * 根据实绩id查找物资唯一编码是否已经稽核完成
  627. */
  628. @PostMapping("/selectMaterialSteelIdByReusltId")
  629. @Transactional
  630. public Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map) {
  631. return wmsFeign.selectMaterialSteelIdByReusltId(map);
  632. }
  633. //下发指令给行车工
  634. @PostMapping("/updateInstruction")
  635. public Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map) {
  636. return wmsFeign.updateInstruction(map);
  637. }
  638. // }
  639. @PostMapping("/getIvboundMakeResultList")
  640. @ApiOperation(value = "展示倒库列表")
  641. @ApiImplicitParams({
  642. @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
  643. })
  644. public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
  645. <<<<<<< HEAD
  646. Integer pageNum,
  647. Integer pageSize,
  648. Integer apiId,
  649. String con) {
  650. =======
  651. Integer pageNum,
  652. Integer pageSize,
  653. Integer apiId,
  654. String con) {
  655. >>>>>>> dev
  656. if (mapValue == null) {
  657. mapValue = new HashMap<>();
  658. }
  659. return wmsFeign.getIvboundMakeResultList(mapValue, pageNum, pageSize, apiId, con);
  660. }
  661. /**
  662. * 新增倒库作业
  663. * @param mapValue
  664. * @return
  665. */
  666. @PostMapping(value = "/addIvboundMakeResult")
  667. public Map<String,Object> addIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
  668. return wmsFeign.addIvboundMakeResult(mapValue);
  669. }
  670. /**
  671. * 逻辑删除倒库作业
  672. * @param resultId
  673. * @return
  674. */
  675. @PostMapping(value = "/deleteIvboundMakeResult/{resultId}")
  676. public Map<String,Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
  677. return wmsFeign.deleteIvboundMakeResult(resultId);
  678. }
  679. /**
  680. * 查询倒库作业
  681. * @param resultId
  682. * @return
  683. */
  684. @PostMapping(value = "/selectIvboundMakeResult/{resultId}")
  685. public List<Map<String,Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
  686. return wmsFeign.selectIvboundMakeResult(resultId);
  687. }
  688. /**
  689. * 修改倒库作业
  690. * @param mapValue
  691. * @return
  692. */
  693. @PostMapping(value = "/updateIvboundMakeResult")
  694. public Map<String,Object> updateIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
  695. return wmsFeign.updateIvboundMakeResult(mapValue);
  696. }
  697. //下发给行车工
  698. @PostMapping("/IssueToCrane")
  699. Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map){
  700. return wmsFeign.IssueToCrane(map);
  701. }
  702. }