WMSController.java 46 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015
  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.awt.image.Kernel;
  14. import java.math.BigDecimal;
  15. import java.util.Date;
  16. import java.util.HashMap;
  17. import java.util.List;
  18. import java.util.Map;
  19. /**
  20. * @author luobang
  21. * @create 2021-09-17 14:09
  22. */
  23. @RestController
  24. @RequestMapping("${api.version}/wms")
  25. public class WMSController extends BaseRESTfulController {
  26. @Autowired
  27. WMSFeign wmsFeign;
  28. @Autowired
  29. QMSFeign qmsFeign;
  30. @PostMapping("getWmsInboundResult")
  31. @ApiOperation(value = "展示入库实绩信息")
  32. @ApiImplicitParams({
  33. @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
  34. })
  35. public Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
  36. Integer apiId,
  37. Integer pageNum,
  38. Integer pageSize,
  39. Integer warehouseId,
  40. String startTime,
  41. String endTime) {
  42. return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
  43. }
  44. @PostMapping("getWmsInboundResultStatistics")
  45. @ApiOperation(value = "展示入库实绩信息")
  46. @ApiImplicitParams({
  47. @ApiImplicitParam(name = "apiId", value = "445", required = false, dataType = "BigDecimal"),
  48. })
  49. public Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
  50. Integer apiId,
  51. Integer pageNum,
  52. Integer pageSize,
  53. Integer warehouseId,
  54. String startTime,
  55. String endTime) {
  56. return wmsFeign.getWmsInboundResultStatistics(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
  57. }
  58. @PostMapping("getWmsInboundResults")
  59. @ApiOperation(value = "展示入库实绩信息")
  60. @ApiImplicitParams({
  61. @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
  62. })
  63. public Map<String, Object> getWmsInboundResults(@RequestBody(required = false) Map<String, Object> mapValue,
  64. Integer apiId,
  65. Integer pageNum,
  66. Integer pageSize,
  67. Integer warehouseId,
  68. String startTime,
  69. String endTime) {
  70. return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
  71. }
  72. @PostMapping("getWmsReservedResult")
  73. @ApiOperation(value = "展示预留入库实绩信息")
  74. @ApiImplicitParams({
  75. @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
  76. })
  77. public Map<String, Object> getWmsReservedResult(@RequestBody(required = false) Map<String, Object> mapValue,
  78. Integer apiId,
  79. Integer pageNum,
  80. Integer pageSize,
  81. Integer warehouseId,
  82. String con) {
  83. return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con);
  84. }
  85. @PostMapping("getWmspOutboundResult")
  86. @ApiOperation(value = "展示出库实绩信息")
  87. @ApiImplicitParams({
  88. @ApiImplicitParam(name = "apiId", value = "152", required = false, dataType = "BigDecimal"),
  89. })
  90. public Map<String, Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
  91. Integer pageNum,
  92. Integer pageSize,
  93. Integer apiId,
  94. Integer warehouseId,
  95. String startTime,
  96. String endTime) {
  97. return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,warehouseId,startTime,endTime);
  98. }
  99. @PostMapping("/wmspoutboundresults/insertWmspOutBoundResult")
  100. @ApiOperation(value = "新增出单实绩并返回出库单详情")
  101. public Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval) {
  102. Map<String, Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
  103. return resTfulResult;
  104. }
  105. @PostMapping(value = "/deletewmspOutboundResult")
  106. public Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId){
  107. return wmsFeign.deleteWmspOutboundResult(resultId);
  108. }
  109. @PostMapping("/wmspoutboundresults/insertwmspOutboundScanResult")
  110. public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
  111. Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
  112. return resTfulResult;
  113. }
  114. @PostMapping("/wmspoutboundresults/outbountResultToSuccess")
  115. public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
  116. return wmsFeign.outbountResultToSuccess(resultId);
  117. }
  118. @PostMapping("/updataResultStatus")
  119. public Map<String, Object> updataResultStatus(@RequestParam Integer resultId) {
  120. Map<String, Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
  121. return resTfulResult;
  122. }
  123. @PostMapping("/getRmsMaterial")
  124. public Map<String, Object> getRmsMaterial(@RequestBody(required = false) Map<String, Object> mapval) {
  125. Map<String, Object> resTfulResult = wmsFeign.getRmsMaterial(mapval);
  126. return resTfulResult;
  127. }
  128. //查询实时库存数据
  129. @PostMapping("/selectGridMaterialList")
  130. @ApiOperation(value = "展示实时库存数据")
  131. @ApiImplicitParams({
  132. @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
  133. })
  134. public Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
  135. Integer pageNum,
  136. Integer pageSize,
  137. Integer apiId,
  138. String warehouseId,
  139. String time,
  140. String con) {
  141. return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,time,con);
  142. }
  143. // 查询仓库中超过库龄预警的物资
  144. @PostMapping("/getGridMaterialAgeList")
  145. @ApiOperation(value = "查询仓库中超过库龄预警的物资")
  146. @ApiImplicitParams({
  147. @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
  148. })
  149. public Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> mapVal,
  150. Integer warehouseId) {
  151. return wmsFeign.getGridMaterialAgeList(mapVal==null?new HashMap<>():mapVal,warehouseId);
  152. }
  153. //通过成品仓库网格ID查询实时库存数据
  154. @PostMapping("/selectGridMaterialListByGridId")
  155. @ApiOperation(value = "通过成品仓库网格ID展示实时库存数据")
  156. @ApiImplicitParams({
  157. @ApiImplicitParam(name = "apiId", value = "155", required = false, dataType = "BigDecimal"),
  158. })
  159. public Map<String,Object> selectGridMaterialListByGridId(BigDecimal gridId) {
  160. return wmsFeign.selectGridMaterialListByGridId(gridId);
  161. }
  162. //修改物资钢材表的质量是否合格字段和逻辑删除
  163. @PostMapping(value = "/updateRmsMaterialSteelDemotion")
  164. public Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map){
  165. return wmsFeign.updateRmsMaterialSteelDemotion(map);
  166. }
  167. //钢材异地库出库扫描
  168. @PostMapping("/OutScanResultTag")
  169. public Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> mapval) {
  170. Map<String, Object> resTfulResult = wmsFeign.OutScanResultTag(mapval);
  171. return resTfulResult;
  172. }
  173. //钢材异地库出库展示实绩
  174. @PostMapping("/getWmsOffsiteLibaryOutboundList")
  175. @ApiOperation(value = "展示实时库存数据")
  176. @ApiImplicitParams({
  177. @ApiImplicitParam(name = "apiId", value = "164", required = false, dataType = "BigDecimal"),
  178. })
  179. public Map<String, Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String, Object> mapVal,
  180. Integer pageNum,
  181. Integer pageSize,
  182. Integer apiId,
  183. String con) {
  184. return wmsFeign.getWmsOffsiteLibaryOutboundList(mapVal == null ? new HashMap<>() : mapVal, pageNum, pageSize, apiId, con);
  185. }
  186. //展示钢材扫描入库实绩列表
  187. @ApiImplicitParams({
  188. @ApiImplicitParam(name = "apiId", value = "165", required = false, dataType = "BigDecimal"),
  189. })
  190. @PostMapping("/getWmsOffsiteLibaryInboundList")
  191. public Map<String, Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> map,
  192. Integer pageNum,
  193. Integer pageSize,
  194. Integer apiId,
  195. String con) {
  196. return wmsFeign.getWmsOffsiteLibaryInboundList(map == null ? new HashMap<>() : map, pageNum, pageSize, apiId, con);
  197. }
  198. //钢材异地库扫描入库
  199. @PostMapping("/ScanResultTag")
  200. public Map<String, Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String, Object> map) {
  201. Map<String, Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
  202. return resTfulResult;
  203. }
  204. //获取扫描实绩
  205. @PostMapping("/getScanResult")
  206. public Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map) {
  207. Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
  208. return resTfulResult;
  209. }
  210. //更新状态
  211. @PostMapping("/updateStatus")
  212. public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {
  213. Map<String, Object> resTfulResult = wmsFeign.updateStatus(map);
  214. return resTfulResult;
  215. }
  216. //展示在途库存数据
  217. @ApiImplicitParams({
  218. @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
  219. })
  220. @PostMapping("/getWmspIntransitInventory")
  221. public Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
  222. Integer pageNum,
  223. Integer pageSize,
  224. Integer apiId,
  225. String con) {
  226. return wmsFeign.getWmspIntransitInventory(mapVal == null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
  227. }
  228. //新增倒库出库实绩
  229. @PostMapping("/insertOutBoundResult")
  230. public Map<String, Object> insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map) {
  231. Map<String, Object> resTfulResult = wmsFeign.insertOutBoundResult(map);
  232. return resTfulResult;
  233. }
  234. //新增倒库出库扫描实绩
  235. @PostMapping("/AddWmspOutboundScanResult")
  236. public Map<String, Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapVal) {
  237. Map<String, Object> resTfulResult = wmsFeign.AddWmspOutboundScanResult(mapVal);
  238. return resTfulResult;
  239. }
  240. //通过下拉框筛选数据
  241. @ApiImplicitParams({
  242. @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
  243. })
  244. @PostMapping("/getWmspRestackMakeResultList")
  245. public Map<String, Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
  246. Integer pageNum,
  247. Integer pageSize,
  248. Integer apiId,
  249. Integer warehouseid,
  250. Integer stackingId,
  251. Integer gradtionNumber) {
  252. return wmsFeign.getWmspRestackMakeResultList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
  253. }
  254. @PostMapping(value = "/addRestackMakeResult")
  255. public Map<String,Object> addRestackMakeResult(@RequestBody Map<String,Object> mapval){
  256. return wmsFeign.addRestackMakeResult(mapval);
  257. }
  258. //删除倒垛单
  259. @PostMapping("/deleteByResultId/{resultId}")
  260. public Map<String, Object> deleteByResultId(@PathVariable String resultId) {
  261. Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
  262. return resTfulResult;
  263. }
  264. //下发倒垛单
  265. @PostMapping("/dispatchDistrubtionStatus/{resultId}")
  266. public Map<String, Object> dispatchDistrubtionStatus(@PathVariable String resultId) {
  267. Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
  268. return resTfulResult;
  269. }
  270. //下拉框获取层次
  271. @GetMapping("/selectGardationNumber")
  272. public Map<String, Object> selectGardationNumber(Integer warehouseid, Integer stackingId) {
  273. Map<String, Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid, stackingId);
  274. return resTfulResult;
  275. }
  276. //下拉框获取仓库名称
  277. @GetMapping("/selectWarehouse")
  278. public Map<String, Object> selectWarehouse() {
  279. Map<String, Object> resTfulResult = wmsFeign.selectWarehouse();
  280. return resTfulResult;
  281. }
  282. //下拉框获取仓库名称
  283. @GetMapping("/selectStackingId")
  284. public Map<String, Object> selectStackingId(Integer warehouseid) {
  285. Map<String, Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
  286. return resTfulResult;
  287. }
  288. //展示倒垛单
  289. @ApiImplicitParams({
  290. @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
  291. })
  292. @PostMapping("/selectRestackList")
  293. public Map<String, Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
  294. Integer pageNum,
  295. Integer pageSize,
  296. Integer apiId,
  297. Integer DistrubtionStatus) {
  298. return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
  299. }
  300. @ApiImplicitParams({
  301. @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
  302. })
  303. @PostMapping("/selectRestackList2")
  304. public Map<String, Object> selectRestackList2(@RequestBody(required = false) Map<String, Object> mapVal,
  305. Integer pageNum,
  306. Integer pageSize,
  307. Integer apiId,
  308. Integer DistrubtionStatus) {
  309. return wmsFeign.selectRestackList2(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
  310. }
  311. @PostMapping("/editRestackMakeResult")
  312. public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
  313. Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
  314. return resTfulResult;
  315. }
  316. //渲染倒垛后的仓库信息
  317. @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
  318. public Map<String, Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId) {
  319. Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
  320. return resTfulResult;
  321. }
  322. //渲染倒垛后的垛位信息
  323. @PostMapping("/selectAfterstackingByResultId/{resultId}")
  324. public Map<String, Object> selectAfterstackingByResultId(@PathVariable Integer resultId) {
  325. Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
  326. return resTfulResult;
  327. }
  328. //PDA展示倒垛单
  329. @PostMapping("/selectRestackForPDA")
  330. public Map<String, Object> selectRestackForPDA(@RequestBody(required = false) Map<String, Object> map) {
  331. Map<String, Object> resTfulResult = wmsFeign.selectRestackForPDA(map);
  332. return resTfulResult;
  333. }
  334. //PDA根据实绩id查找物资信息
  335. @PostMapping("/selectMaterialInfoByResultId")
  336. public Map<String, Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String, Object> map) {
  337. Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
  338. return resTfulResult;
  339. }
  340. @ApiImplicitParams({
  341. @ApiImplicitParam(value = "395",name = "apiId")
  342. })
  343. @PostMapping(value = "/getRestackInfoByResultId")
  344. public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
  345. Integer pageNum,
  346. Integer pageSize,
  347. Integer apiId
  348. ){
  349. return wmsFeign.getRestackInfoByResultId(mapVal==null?new HashMap<>():mapVal, pageNum, pageSize, apiId);
  350. }
  351. //PDA根据仓库id查找倒垛单
  352. @PostMapping("/selectRestackByWarehouseId")
  353. public Map<String, Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String, Object> map) {
  354. Map<String, Object> resTfulResult = wmsFeign.selectRestackByWarehouseId(map);
  355. return resTfulResult;
  356. }
  357. //扫描吊牌添加扫描实绩
  358. @PostMapping("/ScanTagResult")
  359. public Map<String, Object> ScanTagResult(@RequestBody(required = false) Map<String, Object> mal) {
  360. Map<String, Object> resTfulResult = wmsFeign.ScanTagResult(mal);
  361. return resTfulResult;
  362. }
  363. //下发
  364. @PostMapping("/Issue")
  365. public Map<String, Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  366. Map<String, Object> resTfulResult = wmsFeign.Issue(mapList);
  367. return resTfulResult;
  368. }
  369. /**
  370. * 2.展示退库实绩信息
  371. *
  372. * @param mapValue
  373. * @param apiId
  374. * @param pageNum
  375. * @param pageSize
  376. * @return
  377. */
  378. @PostMapping("/getWmsReboundResult")
  379. @ApiOperation(value = "展示退库实绩信息")
  380. @ApiImplicitParams({
  381. @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
  382. })
  383. public RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
  384. Integer apiId,
  385. Integer pageNum,
  386. Integer pageSize,
  387. String con) {
  388. return wmsFeign.getWmsReboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
  389. }
  390. @PostMapping("/selectScanResultByIboundResultId")
  391. @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
  392. @ApiImplicitParams({
  393. @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
  394. })
  395. public RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
  396. @RequestParam Integer apiId,
  397. @RequestParam Integer pageNum,
  398. @RequestParam Integer pageSize,
  399. @RequestParam Integer inboundId
  400. ) {
  401. return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
  402. }
  403. //根据物资信息获取原来垛位信息
  404. @PostMapping("/selectInfoByMaterialCode")
  405. public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
  406. if (mal == null) {
  407. mal = new HashMap<>();
  408. }
  409. return wmsFeign.selectInfoByMaterialCode(mal);
  410. }
  411. //根据仓库查询未接收的垛位
  412. @PostMapping("/selectStackingInfoByWarehouseId")
  413. public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
  414. if (mal == null) {
  415. mal = new HashMap<>();
  416. }
  417. return wmsFeign.selectStackingInfoByWarehouseId(mal);
  418. }
  419. @PostMapping("/getWmsIvboundResult")
  420. @ApiOperation(value = "展示倒库实绩信息")
  421. @ApiImplicitParams({
  422. @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
  423. })
  424. public RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
  425. Integer apiId,
  426. Integer pageNum,
  427. Integer pageSize) {
  428. return wmsFeign.getWmsIvboundResult(mapValue, apiId, pageNum, pageSize);
  429. }
  430. /**
  431. * 展示倒库物资实绩
  432. *
  433. * @param mapValue
  434. * @param apiId
  435. * @param pageNum
  436. * @param pageSize
  437. * @return
  438. */
  439. @PostMapping("/getWmsIvboundMaterialt")
  440. @ApiOperation(value = "展示倒库物资实绩")
  441. @ApiImplicitParams({
  442. @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
  443. })
  444. public RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
  445. Integer apiId,
  446. Integer pageNum,
  447. Integer pageSize) {
  448. return wmsFeign.getWmsIvboundMaterial(mapValue, apiId, pageNum, pageSize);
  449. }
  450. @PostMapping("/getInventoryCheck")
  451. @ApiOperation(value = "展示库存盘点实绩")
  452. @ApiImplicitParams({
  453. @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
  454. })
  455. public RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
  456. Integer apiId,
  457. Integer pageNum,
  458. Integer pageSize,
  459. String con) {
  460. return wmsFeign.getInventoryCheck(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
  461. }
  462. @PostMapping("/getInventoryClose")
  463. @ApiOperation(value = "展示库存结转实绩")
  464. @ApiImplicitParams({
  465. @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
  466. })
  467. public RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
  468. Integer apiId,
  469. Integer pageNum,
  470. Integer pageSize,
  471. String value) {
  472. return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,value);
  473. }
  474. //库存结转定时器
  475. @PostMapping("/addInventoryClose")
  476. @ApiOperation(value = "库存结转定时器")
  477. public RESTfulResult addInventoryClose(){
  478. return wmsFeign.addInventoryClose();
  479. }
  480. @PostMapping("/getSendReceive")
  481. @ApiOperation(value = "展示收发存实绩")
  482. @ApiImplicitParams({
  483. @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
  484. })
  485. public RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
  486. Integer apiId,
  487. Integer pageNum,
  488. Integer pageSize,
  489. String con,
  490. String startTime,
  491. String endTime
  492. ) {
  493. return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
  494. }
  495. /**
  496. * 展示未下发吊钢工扫描吊牌实绩
  497. *
  498. * @return
  499. */
  500. @ApiOperation(value = "展示未下发吊钢工扫描吊牌实绩")
  501. @PostMapping("/getTagResult")
  502. public Map<String, Object> getTagResult() {
  503. return wmsFeign.getTagResult();
  504. }
  505. /**
  506. * 展示正常入库吊钢工扫描吊牌实绩
  507. *
  508. * @return
  509. */
  510. @ApiOperation(value = "展示正常入库吊钢工扫描吊牌实绩")
  511. @PostMapping("/getIssuedTagResult")
  512. public Map getIssuedTagResult() {
  513. return wmsFeign.getIssuedTagResult();
  514. }
  515. /**
  516. * 展示异常入库吊钢工扫描吊牌实绩
  517. *
  518. * @return
  519. */
  520. @ApiOperation(value = "展示异常入库吊钢工扫描吊牌实绩")
  521. @PostMapping("/getIssuedTagNoResult")
  522. public Map getIssuedTagNoResult() {
  523. return wmsFeign.getIssuedTagNoResult();
  524. }
  525. /**
  526. * 展示已退库吊钢工扫描吊牌实绩
  527. *
  528. * @return
  529. */
  530. @ApiOperation(value = "展示已退库吊钢工扫描吊牌实绩")
  531. @PostMapping("/getReIssuedResult")
  532. public Map getReIssuedResult() {
  533. return wmsFeign.getIssuedResult();
  534. }
  535. /**
  536. * 展示未下发退库吊钢工扫描吊牌实绩
  537. *
  538. * @return
  539. */
  540. @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
  541. @PostMapping("/getReTagResult")
  542. public Map getReTagResult() {
  543. return wmsFeign.getReTagResult();
  544. }
  545. /**
  546. * 展示已倒库入库吊钢工扫描吊牌实绩
  547. *
  548. * @return
  549. */
  550. @ApiOperation(value = "展示已倒库入库吊钢工扫描吊牌实绩")
  551. @PostMapping("/getIvIssuedResult")
  552. public Map getIvIssuedResult() {
  553. return wmsFeign.getIvIssuedResult();
  554. }
  555. /**
  556. * 展示未下发退库吊钢工扫描吊牌实绩
  557. *
  558. * @return
  559. */
  560. @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
  561. @PostMapping("/getIvTagResult")
  562. public Map getIvTagResult() {
  563. return wmsFeign.getIvTagResult();
  564. }
  565. /**
  566. * 新增入库实绩
  567. *
  568. * @param mapList
  569. * @return
  570. */
  571. @ApiOperation("新增入库实绩")
  572. @PostMapping("/insertInboundResult")
  573. @Transactional
  574. public Map<String,Object> addInvoice(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  575. return wmsFeign.insertInboundResult(mapList);
  576. }
  577. /**
  578. * 新增退库实绩
  579. *
  580. * @param mapList
  581. * @return
  582. */
  583. @ApiOperation("新增退库实绩")
  584. @PostMapping("/insertReboundResult")
  585. @Transactional
  586. public String addReboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  587. /*
  588. 获取入库物资件数
  589. */
  590. int size = mapList.size();
  591. /*
  592. 获取入库垛位
  593. */
  594. Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
  595. String stackNo = (String) map1.get("stackNo");
  596. BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
  597. for (Map<String, Object> map : mapList
  598. ) {
  599. map.put("stackingId", stackId);
  600. }
  601. wmsFeign.insertReboundResult(mapList);
  602. return stackNo;
  603. }
  604. /**
  605. * 新增倒库入库实绩
  606. *
  607. * @param mapList
  608. * @return
  609. */
  610. @ApiOperation("新增倒库入库实绩")
  611. @PostMapping("/insertIvboundResult")
  612. @Transactional
  613. public String addIvboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  614. /*
  615. 获取入库物资件数
  616. */
  617. int size = mapList.size();
  618. /*
  619. 获取入库垛位
  620. */
  621. Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
  622. String stackNo = (String) map1.get("stackNo");
  623. BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
  624. for (Map<String, Object> map : mapList
  625. ) {
  626. map.put("stackingId", stackId);
  627. }
  628. wmsFeign.insertIvboundResult(mapList);
  629. return stackNo;
  630. }
  631. /**
  632. * 展示入库垛位
  633. *
  634. * @param DriverId
  635. * @return
  636. */
  637. @PostMapping("/getInboundStack")
  638. @ApiOperation(value = "展示入库垛位")
  639. public Integer getInboundStack(Integer DriverId) {
  640. return wmsFeign.getInboundStack(DriverId);
  641. }
  642. /**
  643. * 新增库存盘点
  644. *
  645. * @param map
  646. * @return
  647. */
  648. @PostMapping("/inventoryCheck")
  649. @ApiOperation(value = "新增库存盘点")
  650. public Map<String, Object> inventoryCheck(@RequestBody(required = false) Map<String, Object> map) {
  651. return wmsFeign.inventoryCheck(map);
  652. }
  653. /**
  654. * 新增入库扫描吊牌实绩
  655. *
  656. * @param map
  657. * @return
  658. */
  659. @ApiOperation(value = "新增入库扫描吊牌实绩")
  660. @PostMapping("/inboundScanResult/insertResult")
  661. @Transactional
  662. public Map<String, Object> insertResult(@RequestBody(required = false) Map<String, Object> map) {
  663. return wmsFeign.insertResult(map);
  664. }
  665. /**
  666. * 新增退库扫描吊牌实绩
  667. *
  668. * @param map
  669. * @return
  670. */
  671. @ApiOperation(value = "新增退库扫描吊牌实绩")
  672. @PostMapping("/insertReboundScanResult")
  673. @Transactional
  674. public Map<String, Object> insertReboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
  675. return wmsFeign.insertReboundScanResult(map);
  676. }
  677. /**
  678. * 新增倒库入库扫描吊牌实绩
  679. *
  680. * @param map
  681. * @return
  682. */
  683. @ApiOperation(value = "新增倒库入库扫描吊牌实绩")
  684. @PostMapping("/insertIvboundScanResult")
  685. @Transactional
  686. public Map<String, Object> insertIvboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
  687. return wmsFeign.insertIvboundScanResult(map);
  688. }
  689. /**
  690. * 根据实绩id查找物资唯一编码是否已经稽核完成
  691. */
  692. @PostMapping("/selectMaterialSteelIdByReusltId")
  693. @Transactional
  694. public Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map) {
  695. return wmsFeign.selectMaterialSteelIdByReusltId(map);
  696. }
  697. //下发指令给行车工
  698. @PostMapping("/updateInstruction")
  699. public Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map) {
  700. return wmsFeign.updateInstruction(map);
  701. }
  702. @PostMapping("/getIvboundMakeResultList")
  703. @ApiOperation(value = "展示倒库列表")
  704. @ApiImplicitParams({
  705. @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
  706. })
  707. public RESTfulResult getIvboundMakeResultList(@RequestBody(required = false) Map<String, Object> mapValue,
  708. Integer pageNum,
  709. Integer pageSize,
  710. Integer apiId,
  711. String con) {
  712. if (mapValue == null) {
  713. mapValue = new HashMap<>();
  714. }
  715. return wmsFeign.getIvboundMakeResultList(mapValue, pageNum, pageSize, apiId, con);
  716. }
  717. /**
  718. * 新增倒库作业
  719. * @param mapValue
  720. * @return
  721. */
  722. @PostMapping(value = "/addIvboundMakeResult")
  723. public Map<String,Object> addIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
  724. return wmsFeign.addIvboundMakeResult(mapValue);
  725. }
  726. /**
  727. * 逻辑删除倒库作业
  728. * @param resultId
  729. * @return
  730. */
  731. @PostMapping(value = "/deleteIvboundMakeResult/{resultId}")
  732. public Map<String,Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
  733. return wmsFeign.deleteIvboundMakeResult(resultId);
  734. }
  735. /**
  736. * 查询倒库作业
  737. * @param resultId
  738. * @return
  739. */
  740. @PostMapping(value = "/selectIvboundMakeResult/{resultId}")
  741. public List<Map<String,Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
  742. return wmsFeign.selectIvboundMakeResult(resultId);
  743. }
  744. /**
  745. * 修改倒库作业
  746. * @param mapValue
  747. * @return
  748. */
  749. @PostMapping(value = "/updateIvboundMakeResult")
  750. public Map<String,Object> updateIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
  751. return wmsFeign.updateIvboundMakeResult(mapValue);
  752. }
  753. //下发给行车工
  754. @PostMapping("/IssueToCrane")
  755. Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map){
  756. return wmsFeign.IssueToCrane(map);
  757. }
  758. //新增入库实绩
  759. @PostMapping("/inboundResult/insertInboundResult")
  760. public RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList){
  761. return wmsFeign.addInvoice(userName,groupId,personnelWorkshopid,mapList);
  762. }
  763. //抢单
  764. @PostMapping("/wmspinbounddistributes/grabDistribute")
  765. public RESTfulResult grabDistribute( @RequestBody Map<String,Object> mapValue){
  766. return wmsFeign.grabDistribute(mapValue);
  767. }
  768. @GetMapping("/wmspinbounddistributes/getNewDistribute")
  769. public RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid){
  770. return wmsFeign.getNewDistribute(personnelWorkshopid);
  771. }
  772. // @PostMapping("/createRestackMakeResult")
  773. // public RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
  774. // @RequestParam("beforeLevel")BigDecimal beforeLevel,
  775. // @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
  776. // @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
  777. // @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
  778. // @RequestParam("resultRemark")String resultRemark,
  779. // @RequestBody(required = false) List<Map<String,Object>> mps){
  780. // return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
  781. // }
  782. // 获取物资类型
  783. @PostMapping(value = "/getMaterialTypeList")
  784. public Map<String, Object> getMaterialTypeList (@RequestParam("warehouseid") String warehouseid,
  785. @RequestParam("stackingId") BigDecimal stackingId,
  786. @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
  787. @RequestParam("pageNum") Integer pageNum,
  788. @RequestParam("pageSize") Integer pageSize,
  789. @RequestParam("apiId") Integer apiId){
  790. return wmsFeign.getMaterialTypeList(warehouseid, stackingId, gradtionNumber, pageNum, pageSize, apiId);
  791. }
  792. @ApiOperation("进入出库扫码页面,查询出库物资信息详情")
  793. @GetMapping("/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
  794. @ApiImplicitParam(name = "resultId",value = "出库实绩id",paramType = "BigDecimal",required = true)
  795. public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId){
  796. return wmsFeign.getInitOutboundScanResultMaterialInfo(resultId);
  797. }
  798. @PostMapping("/wmspoutboundresults/deleteGridMaterial")
  799. public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode){
  800. return wmsFeign.deleteGridMaterial(materialOnlyCode);
  801. }
  802. @PostMapping(value = "/createRestackMakeResult")
  803. public Map<String, Object> createRestackMakeResult (@RequestParam("keeperId") BigDecimal keeperId,
  804. @RequestParam("beforeLevel") BigDecimal beforeLevel,
  805. @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
  806. @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
  807. @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
  808. @RequestParam("resultRemark") String resultRemark,
  809. @RequestBody(required = false) List < Map < String, Object >> mps){
  810. return wmsFeign.createRestackMakeResult(keeperId, beforeLevel, afterStackingId, afterWarehouseId, afterBeforeStackingId, resultRemark, mps);
  811. }
  812. //修改实时库存,针对倒垛
  813. @PostMapping(value = "/updateWmspGridMaterialForRestack")
  814. public Map<String, Object> updateWmspGridMaterialForRestack (@RequestBody Map < String, Object > mapValue){
  815. return wmsFeign.updateWmspGridMaterialForRestack(mapValue);
  816. }
  817. //修改实时库存,针对倒垛
  818. @PostMapping(value = "/getStockTakingList")
  819. public Map<String, Object> getStockTakingList (@RequestParam(value = "pageNum") Integer pageNum,
  820. @RequestParam(value = "pageSize") Integer pageSize,
  821. @RequestParam(value = "apiId") Integer apiId){
  822. return wmsFeign.getStockTakingList(pageNum, pageSize, apiId);
  823. }
  824. // 根据倒垛单ID获得物资类型
  825. @GetMapping(value = "getRestackMakeTypeResult")
  826. public Map<String, Object> getRestackMakeTypeResult (@RequestParam("restackMake") String restackMake,
  827. @RequestParam("context") String context){
  828. return wmsFeign.getRestackMakeTypeResult(restackMake, context);
  829. }
  830. // 改变已经稽核的吊牌信息
  831. @GetMapping(value = "changeRestackMakeResult")
  832. public int changeRestackMakeResult (@RequestParam("restackMake") String restackMake){
  833. return wmsFeign.changeRestackMakeResult(restackMake);
  834. }
  835. //PDA根据仓库id查找倒垛单
  836. @GetMapping(value = "selectRestackByWarehouseIds")
  837. public Map<String, Object> selectRestackByWarehouseIds(@RequestParam("warehouseid") String warehouseid) {
  838. return wmsFeign.selectRestackByWarehouseIds(warehouseid);
  839. }
  840. //修改实时库存,针对倒垛
  841. @PostMapping(value = "/insertStockTaking")
  842. public Map<String,Object> insertStockTaking(@RequestParam(value = "warehouseId") String warehouseId,
  843. @RequestParam(value = "materialCode") String materialCode,
  844. @RequestParam(value = "quantity") Integer quantity) {
  845. return wmsFeign.insertStockTaking(warehouseId,materialCode,quantity);
  846. }
  847. //修改入库转预留作业,针对预留
  848. @PostMapping(value = "/insertReserved")
  849. public Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
  850. @RequestParam(value = "materialCode") String materialCode,
  851. @RequestParam(value = "materialSpecification") String materialSpecification,
  852. @RequestParam(value = "materialModel") String materialModel,
  853. @RequestParam(value = "quantity") Integer quantity) {
  854. return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity);
  855. }
  856. //修改预留转入库作业,针对预留
  857. @PostMapping(value = "/insertInbounds")
  858. public Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
  859. @RequestParam(value = "materialCode") String materialCode,
  860. @RequestParam(value = "materialSpecification") String materialSpecification,
  861. @RequestParam(value = "materialModel") String materialModel,
  862. @RequestParam(value = "quantity") Integer quantity) {
  863. return wmsFeign.insertInbounds(warehouseId,materialCode,materialSpecification,materialModel,quantity);
  864. }
  865. // 查询所有的钢材物资信息
  866. @PostMapping(value = "/getSteelMaterialList")
  867. public Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
  868. Integer pageNum,
  869. Integer pageSize,
  870. Integer apiId,
  871. Integer warehouseId,
  872. String con) {
  873. return wmsFeign.getSteelMaterialList(mapVal ==null? new HashMap<>():mapVal,pageNum,pageSize,apiId,warehouseId,con);
  874. }
  875. // 查询所有的钢材物资信息
  876. @PostMapping(value = "/getSteelWarehouseList")
  877. public Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
  878. Integer apiId,
  879. Integer pageNum,
  880. Integer pageSize,
  881. String con) {
  882. return wmsFeign.getSteelWarehouseList(mapVal ==null? new HashMap<>():mapVal,apiId,pageNum,pageSize,con);
  883. }
  884. // 查询所有的钢材物资规格型号信息
  885. @PostMapping(value = "/getSteelMaterialModelList")
  886. public Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
  887. @RequestParam(value = "pageNum") Integer pageNum,
  888. @RequestParam(value = "pageSize") Integer pageSize,
  889. @RequestParam(value = "apiId") Integer apiId,
  890. @RequestParam(value = "warehouseId") Integer warehouseId,
  891. @RequestParam(value = "status") Integer status,
  892. @RequestParam(value = "con") String con) {
  893. return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,con);
  894. }
  895. // 根据对应的入库实绩id修改入库状态为预留
  896. @PostMapping("/changeReserved")
  897. @ApiOperation(value = "根据对应的入库实绩id修改入库状态为预留")
  898. public int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  899. return wmsFeign.changeReserved(mapList);
  900. }
  901. @PostMapping("/getWmsOutboundResultStatistics")
  902. @ApiOperation(value = "展示炉号对应的出厂数量")
  903. @ApiImplicitParams({
  904. @ApiImplicitParam(name = "apiId", value = "446", required = false, dataType = "BigDecimal"),
  905. })
  906. public RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
  907. Integer apiId,
  908. Integer pageNum,
  909. Integer pageSize,
  910. Integer warehouseId,
  911. String con,
  912. String startTime,
  913. String endTime) {
  914. return wmsFeign.getWmsOutboundResultStatistics(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con,startTime,endTime);
  915. }
  916. }