WMSController.java 43 KB

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