WMSController.java 46 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025
  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("/getFurnaceNoAmount")
  212. public Map<String, Object> getFurnaceNoAmount(@RequestBody(required = false) Map<String, Object> map) {
  213. Map<String, Object> resTfulResult = wmsFeign.getFurnaceNoAmount(map);
  214. return resTfulResult;
  215. }
  216. //更新状态
  217. @PostMapping("/updateStatus")
  218. public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {
  219. Map<String, Object> resTfulResult = wmsFeign.updateStatus(map);
  220. return resTfulResult;
  221. }
  222. //展示在途库存数据
  223. @ApiImplicitParams({
  224. @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
  225. })
  226. @PostMapping("/getWmspIntransitInventory")
  227. public Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
  228. Integer pageNum,
  229. Integer pageSize,
  230. Integer apiId,
  231. String con) {
  232. return wmsFeign.getWmspIntransitInventory(mapVal == null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
  233. }
  234. //新增倒库出库实绩
  235. @PostMapping("/insertOutBoundResult")
  236. public Map<String, Object> insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map) {
  237. Map<String, Object> resTfulResult = wmsFeign.insertOutBoundResult(map);
  238. return resTfulResult;
  239. }
  240. //新增倒库出库扫描实绩
  241. @PostMapping("/AddWmspOutboundScanResult")
  242. public Map<String, Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapVal) {
  243. Map<String, Object> resTfulResult = wmsFeign.AddWmspOutboundScanResult(mapVal);
  244. return resTfulResult;
  245. }
  246. //通过下拉框筛选数据
  247. @ApiImplicitParams({
  248. @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
  249. })
  250. @PostMapping("/getWmspRestackMakeResultList")
  251. public Map<String, Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
  252. Integer pageNum,
  253. Integer pageSize,
  254. Integer apiId,
  255. Integer warehouseid,
  256. Integer stackingId,
  257. Integer gradtionNumber) {
  258. return wmsFeign.getWmspRestackMakeResultList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
  259. }
  260. @PostMapping(value = "/addRestackMakeResult")
  261. public Map<String,Object> addRestackMakeResult(@RequestBody Map<String,Object> mapval){
  262. return wmsFeign.addRestackMakeResult(mapval);
  263. }
  264. //删除倒垛单
  265. @PostMapping("/deleteByResultId/{resultId}")
  266. public Map<String, Object> deleteByResultId(@PathVariable String resultId) {
  267. Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
  268. return resTfulResult;
  269. }
  270. //下发倒垛单
  271. @PostMapping("/dispatchDistrubtionStatus/{resultId}")
  272. public Map<String, Object> dispatchDistrubtionStatus(@PathVariable String resultId) {
  273. Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
  274. return resTfulResult;
  275. }
  276. //下拉框获取层次
  277. @GetMapping("/selectGardationNumber")
  278. public Map<String, Object> selectGardationNumber(Integer warehouseid, Integer stackingId) {
  279. Map<String, Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid, stackingId);
  280. return resTfulResult;
  281. }
  282. //下拉框获取仓库名称
  283. @GetMapping("/selectWarehouse")
  284. public Map<String, Object> selectWarehouse() {
  285. Map<String, Object> resTfulResult = wmsFeign.selectWarehouse();
  286. return resTfulResult;
  287. }
  288. //下拉框获取仓库名称
  289. @GetMapping("/selectStackingId")
  290. public Map<String, Object> selectStackingId(Integer warehouseid) {
  291. Map<String, Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
  292. return resTfulResult;
  293. }
  294. //展示倒垛单
  295. @ApiImplicitParams({
  296. @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
  297. })
  298. @PostMapping("/selectRestackList")
  299. public Map<String, Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
  300. Integer pageNum,
  301. Integer pageSize,
  302. Integer apiId,
  303. Integer DistrubtionStatus) {
  304. return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
  305. }
  306. @ApiImplicitParams({
  307. @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
  308. })
  309. @PostMapping("/selectRestackList2")
  310. public Map<String, Object> selectRestackList2(@RequestBody(required = false) Map<String, Object> mapVal,
  311. Integer pageNum,
  312. Integer pageSize,
  313. Integer apiId,
  314. Integer DistrubtionStatus) {
  315. return wmsFeign.selectRestackList2(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
  316. }
  317. @PostMapping("/editRestackMakeResult")
  318. public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
  319. Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
  320. return resTfulResult;
  321. }
  322. //渲染倒垛后的仓库信息
  323. @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
  324. public Map<String, Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId) {
  325. Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
  326. return resTfulResult;
  327. }
  328. //渲染倒垛后的垛位信息
  329. @PostMapping("/selectAfterstackingByResultId/{resultId}")
  330. public Map<String, Object> selectAfterstackingByResultId(@PathVariable Integer resultId) {
  331. Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
  332. return resTfulResult;
  333. }
  334. //PDA展示倒垛单
  335. @PostMapping("/selectRestackForPDA")
  336. public Map<String, Object> selectRestackForPDA(@RequestBody(required = false) Map<String, Object> map) {
  337. Map<String, Object> resTfulResult = wmsFeign.selectRestackForPDA(map);
  338. return resTfulResult;
  339. }
  340. //PDA根据实绩id查找物资信息
  341. @PostMapping("/selectMaterialInfoByResultId")
  342. public Map<String, Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String, Object> map) {
  343. Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
  344. return resTfulResult;
  345. }
  346. @ApiImplicitParams({
  347. @ApiImplicitParam(value = "395",name = "apiId")
  348. })
  349. @PostMapping(value = "/getRestackInfoByResultId")
  350. public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
  351. Integer pageNum,
  352. Integer pageSize,
  353. Integer apiId
  354. ){
  355. return wmsFeign.getRestackInfoByResultId(mapVal==null?new HashMap<>():mapVal, pageNum, pageSize, apiId);
  356. }
  357. //PDA根据仓库id查找倒垛单
  358. @PostMapping("/selectRestackByWarehouseId")
  359. public Map<String, Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String, Object> map) {
  360. Map<String, Object> resTfulResult = wmsFeign.selectRestackByWarehouseId(map);
  361. return resTfulResult;
  362. }
  363. //扫描吊牌添加扫描实绩
  364. @PostMapping("/ScanTagResult")
  365. public Map<String, Object> ScanTagResult(@RequestBody(required = false) Map<String, Object> mal) {
  366. Map<String, Object> resTfulResult = wmsFeign.ScanTagResult(mal);
  367. return resTfulResult;
  368. }
  369. //下发
  370. @PostMapping("/Issue")
  371. public Map<String, Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  372. Map<String, Object> resTfulResult = wmsFeign.Issue(mapList);
  373. return resTfulResult;
  374. }
  375. /**
  376. * 2.展示退库实绩信息
  377. *
  378. * @param mapValue
  379. * @param apiId
  380. * @param pageNum
  381. * @param pageSize
  382. * @return
  383. */
  384. @PostMapping("/getWmsReboundResult")
  385. @ApiOperation(value = "展示退库实绩信息")
  386. @ApiImplicitParams({
  387. @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
  388. })
  389. public RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
  390. Integer apiId,
  391. Integer pageNum,
  392. Integer pageSize,
  393. String con) {
  394. return wmsFeign.getWmsReboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
  395. }
  396. @PostMapping("/selectScanResultByIboundResultId")
  397. @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
  398. @ApiImplicitParams({
  399. @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
  400. })
  401. public RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
  402. @RequestParam Integer apiId,
  403. @RequestParam Integer pageNum,
  404. @RequestParam Integer pageSize,
  405. @RequestParam Integer inboundId
  406. ) {
  407. return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
  408. }
  409. //根据物资信息获取原来垛位信息
  410. @PostMapping("/selectInfoByMaterialCode")
  411. public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
  412. if (mal == null) {
  413. mal = new HashMap<>();
  414. }
  415. return wmsFeign.selectInfoByMaterialCode(mal);
  416. }
  417. //根据仓库查询未接收的垛位
  418. @PostMapping("/selectStackingInfoByWarehouseId")
  419. public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
  420. if (mal == null) {
  421. mal = new HashMap<>();
  422. }
  423. return wmsFeign.selectStackingInfoByWarehouseId(mal);
  424. }
  425. @PostMapping("/getWmsIvboundResult")
  426. @ApiOperation(value = "展示倒库实绩信息")
  427. @ApiImplicitParams({
  428. @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
  429. })
  430. public RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
  431. Integer apiId,
  432. Integer pageNum,
  433. Integer pageSize) {
  434. return wmsFeign.getWmsIvboundResult(mapValue, apiId, pageNum, pageSize);
  435. }
  436. /**
  437. * 展示倒库物资实绩
  438. *
  439. * @param mapValue
  440. * @param apiId
  441. * @param pageNum
  442. * @param pageSize
  443. * @return
  444. */
  445. @PostMapping("/getWmsIvboundMaterialt")
  446. @ApiOperation(value = "展示倒库物资实绩")
  447. @ApiImplicitParams({
  448. @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
  449. })
  450. public RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
  451. Integer apiId,
  452. Integer pageNum,
  453. Integer pageSize) {
  454. return wmsFeign.getWmsIvboundMaterial(mapValue, apiId, pageNum, pageSize);
  455. }
  456. @PostMapping("/getInventoryCheck")
  457. @ApiOperation(value = "展示库存盘点实绩")
  458. @ApiImplicitParams({
  459. @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
  460. })
  461. public RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
  462. Integer apiId,
  463. Integer pageNum,
  464. Integer pageSize,
  465. String con) {
  466. return wmsFeign.getInventoryCheck(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
  467. }
  468. @PostMapping("/getInventoryClose")
  469. @ApiOperation(value = "展示库存结转实绩")
  470. @ApiImplicitParams({
  471. @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
  472. })
  473. public RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
  474. Integer apiId,
  475. Integer pageNum,
  476. Integer pageSize,
  477. String value) {
  478. return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,value);
  479. }
  480. //库存结转定时器
  481. @PostMapping("/addInventoryClose")
  482. @ApiOperation(value = "库存结转定时器")
  483. public RESTfulResult addInventoryClose(){
  484. return wmsFeign.addInventoryClose();
  485. }
  486. @PostMapping("/getSendReceive")
  487. @ApiOperation(value = "展示收发存实绩")
  488. @ApiImplicitParams({
  489. @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
  490. })
  491. public RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
  492. Integer apiId,
  493. Integer pageNum,
  494. Integer pageSize,
  495. String con,
  496. String startTime,
  497. String endTime) {
  498. return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
  499. }
  500. /**
  501. * 展示未下发吊钢工扫描吊牌实绩
  502. *
  503. * @return
  504. */
  505. @ApiOperation(value = "展示未下发吊钢工扫描吊牌实绩")
  506. @PostMapping("/getTagResult")
  507. public Map<String, Object> getTagResult() {
  508. return wmsFeign.getTagResult();
  509. }
  510. /**
  511. * 展示正常入库吊钢工扫描吊牌实绩
  512. *
  513. * @return
  514. */
  515. @ApiOperation(value = "展示正常入库吊钢工扫描吊牌实绩")
  516. @PostMapping("/getIssuedTagResult")
  517. public Map getIssuedTagResult() {
  518. return wmsFeign.getIssuedTagResult();
  519. }
  520. /**
  521. * 展示异常入库吊钢工扫描吊牌实绩
  522. *
  523. * @return
  524. */
  525. @ApiOperation(value = "展示异常入库吊钢工扫描吊牌实绩")
  526. @PostMapping("/getIssuedTagNoResult")
  527. public Map getIssuedTagNoResult() {
  528. return wmsFeign.getIssuedTagNoResult();
  529. }
  530. /**
  531. * 展示已退库吊钢工扫描吊牌实绩
  532. *
  533. * @return
  534. */
  535. @ApiOperation(value = "展示已退库吊钢工扫描吊牌实绩")
  536. @PostMapping("/getReIssuedResult")
  537. public Map getReIssuedResult() {
  538. return wmsFeign.getIssuedResult();
  539. }
  540. /**
  541. * 展示未下发退库吊钢工扫描吊牌实绩
  542. *
  543. * @return
  544. */
  545. @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
  546. @PostMapping("/getReTagResult")
  547. public Map getReTagResult() {
  548. return wmsFeign.getReTagResult();
  549. }
  550. /**
  551. * 展示已倒库入库吊钢工扫描吊牌实绩
  552. *
  553. * @return
  554. */
  555. @ApiOperation(value = "展示已倒库入库吊钢工扫描吊牌实绩")
  556. @PostMapping("/getIvIssuedResult")
  557. public Map getIvIssuedResult() {
  558. return wmsFeign.getIvIssuedResult();
  559. }
  560. /**
  561. * 展示未下发退库吊钢工扫描吊牌实绩
  562. *
  563. * @return
  564. */
  565. @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
  566. @PostMapping("/getIvTagResult")
  567. public Map getIvTagResult() {
  568. return wmsFeign.getIvTagResult();
  569. }
  570. /**
  571. * 新增入库实绩
  572. *
  573. * @param mapList
  574. * @return
  575. */
  576. @ApiOperation("新增入库实绩")
  577. @PostMapping("/insertInboundResult")
  578. @Transactional
  579. public Map<String,Object> addInvoice(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  580. return wmsFeign.insertInboundResult(mapList);
  581. }
  582. /**
  583. * 新增退库实绩
  584. *
  585. * @param mapList
  586. * @return
  587. */
  588. @ApiOperation("新增退库实绩")
  589. @PostMapping("/insertReboundResult")
  590. @Transactional
  591. public String addReboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  592. /*
  593. 获取入库物资件数
  594. */
  595. int size = mapList.size();
  596. /*
  597. 获取入库垛位
  598. */
  599. Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
  600. String stackNo = (String) map1.get("stackNo");
  601. BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
  602. for (Map<String, Object> map : mapList
  603. ) {
  604. map.put("stackingId", stackId);
  605. }
  606. wmsFeign.insertReboundResult(mapList);
  607. return stackNo;
  608. }
  609. /**
  610. * 新增倒库入库实绩
  611. *
  612. * @param mapList
  613. * @return
  614. */
  615. @ApiOperation("新增倒库入库实绩")
  616. @PostMapping("/insertIvboundResult")
  617. @Transactional
  618. public String addIvboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  619. /*
  620. 获取入库物资件数
  621. */
  622. int size = mapList.size();
  623. /*
  624. 获取入库垛位
  625. */
  626. Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
  627. String stackNo = (String) map1.get("stackNo");
  628. BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
  629. for (Map<String, Object> map : mapList
  630. ) {
  631. map.put("stackingId", stackId);
  632. }
  633. wmsFeign.insertIvboundResult(mapList);
  634. return stackNo;
  635. }
  636. /**
  637. * 展示入库垛位
  638. *
  639. * @param DriverId
  640. * @return
  641. */
  642. @PostMapping("/getInboundStack")
  643. @ApiOperation(value = "展示入库垛位")
  644. public Integer getInboundStack(Integer DriverId) {
  645. return wmsFeign.getInboundStack(DriverId);
  646. }
  647. /**
  648. * 新增库存盘点
  649. *
  650. * @param map
  651. * @return
  652. */
  653. @PostMapping("/inventoryCheck")
  654. @ApiOperation(value = "新增库存盘点")
  655. public Map<String, Object> inventoryCheck(@RequestBody(required = false) Map<String, Object> map) {
  656. return wmsFeign.inventoryCheck(map);
  657. }
  658. /**
  659. * 新增入库扫描吊牌实绩
  660. *
  661. * @param map
  662. * @return
  663. */
  664. @ApiOperation(value = "新增入库扫描吊牌实绩")
  665. @PostMapping("/inboundScanResult/insertResult")
  666. @Transactional
  667. public Map<String, Object> insertResult(@RequestBody(required = false) Map<String, Object> map) {
  668. return wmsFeign.insertResult(map);
  669. }
  670. /**
  671. * 新增退库扫描吊牌实绩
  672. *
  673. * @param map
  674. * @return
  675. */
  676. @ApiOperation(value = "新增退库扫描吊牌实绩")
  677. @PostMapping("/insertReboundScanResult")
  678. @Transactional
  679. public Map<String, Object> insertReboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
  680. return wmsFeign.insertReboundScanResult(map);
  681. }
  682. /**
  683. * 新增倒库入库扫描吊牌实绩
  684. *
  685. * @param map
  686. * @return
  687. */
  688. @ApiOperation(value = "新增倒库入库扫描吊牌实绩")
  689. @PostMapping("/insertIvboundScanResult")
  690. @Transactional
  691. public Map<String, Object> insertIvboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
  692. return wmsFeign.insertIvboundScanResult(map);
  693. }
  694. /**
  695. * 根据实绩id查找物资唯一编码是否已经稽核完成
  696. */
  697. @PostMapping("/selectMaterialSteelIdByReusltId")
  698. @Transactional
  699. public Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map) {
  700. return wmsFeign.selectMaterialSteelIdByReusltId(map);
  701. }
  702. //下发指令给行车工
  703. @PostMapping("/updateInstruction")
  704. public Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map) {
  705. return wmsFeign.updateInstruction(map);
  706. }
  707. @PostMapping("/getIvboundMakeResultList")
  708. @ApiOperation(value = "展示倒库列表")
  709. @ApiImplicitParams({
  710. @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
  711. })
  712. public RESTfulResult getIvboundMakeResultList(@RequestBody(required = false) Map<String, Object> mapValue,
  713. Integer pageNum,
  714. Integer pageSize,
  715. Integer apiId,
  716. String con) {
  717. if (mapValue == null) {
  718. mapValue = new HashMap<>();
  719. }
  720. return wmsFeign.getIvboundMakeResultList(mapValue, pageNum, pageSize, apiId, con);
  721. }
  722. /**
  723. * 新增倒库作业
  724. * @param mapValue
  725. * @return
  726. */
  727. @PostMapping(value = "/addIvboundMakeResult")
  728. public Map<String,Object> addIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
  729. return wmsFeign.addIvboundMakeResult(mapValue);
  730. }
  731. /**
  732. * 逻辑删除倒库作业
  733. * @param resultId
  734. * @return
  735. */
  736. @PostMapping(value = "/deleteIvboundMakeResult/{resultId}")
  737. public Map<String,Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
  738. return wmsFeign.deleteIvboundMakeResult(resultId);
  739. }
  740. /**
  741. * 查询倒库作业
  742. * @param resultId
  743. * @return
  744. */
  745. @PostMapping(value = "/selectIvboundMakeResult/{resultId}")
  746. public List<Map<String,Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
  747. return wmsFeign.selectIvboundMakeResult(resultId);
  748. }
  749. /**
  750. * 修改倒库作业
  751. * @param mapValue
  752. * @return
  753. */
  754. @PostMapping(value = "/updateIvboundMakeResult")
  755. public Map<String,Object> updateIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
  756. return wmsFeign.updateIvboundMakeResult(mapValue);
  757. }
  758. //下发给行车工
  759. @PostMapping("/IssueToCrane")
  760. Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map){
  761. return wmsFeign.IssueToCrane(map);
  762. }
  763. //新增入库实绩
  764. @PostMapping("/inboundResult/insertInboundResult")
  765. public RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList){
  766. return wmsFeign.addInvoice(userName,groupId,personnelWorkshopid,mapList);
  767. }
  768. //抢单
  769. @PostMapping("/wmspinbounddistributes/grabDistribute")
  770. public RESTfulResult grabDistribute( @RequestBody Map<String,Object> mapValue){
  771. return wmsFeign.grabDistribute(mapValue);
  772. }
  773. @GetMapping("/wmspinbounddistributes/getNewDistribute")
  774. public RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid){
  775. return wmsFeign.getNewDistribute(personnelWorkshopid);
  776. }
  777. // @PostMapping("/createRestackMakeResult")
  778. // public RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
  779. // @RequestParam("beforeLevel")BigDecimal beforeLevel,
  780. // @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
  781. // @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
  782. // @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
  783. // @RequestParam("resultRemark")String resultRemark,
  784. // @RequestBody(required = false) List<Map<String,Object>> mps){
  785. // return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
  786. // }
  787. // 获取物资类型
  788. @PostMapping(value = "/getMaterialTypeList")
  789. public Map<String, Object> getMaterialTypeList (@RequestParam("warehouseid") String warehouseid,
  790. @RequestParam("stackingId") BigDecimal stackingId,
  791. @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
  792. @RequestParam("pageNum") Integer pageNum,
  793. @RequestParam("pageSize") Integer pageSize,
  794. @RequestParam("apiId") Integer apiId){
  795. return wmsFeign.getMaterialTypeList(warehouseid, stackingId, gradtionNumber, pageNum, pageSize, apiId);
  796. }
  797. @ApiOperation("进入出库扫码页面,查询出库物资信息详情")
  798. @GetMapping("/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
  799. @ApiImplicitParam(name = "resultId",value = "出库实绩id",paramType = "BigDecimal",required = true)
  800. public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId){
  801. return wmsFeign.getInitOutboundScanResultMaterialInfo(resultId);
  802. }
  803. @PostMapping("/wmspoutboundresults/deleteGridMaterial")
  804. public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode){
  805. return wmsFeign.deleteGridMaterial(materialOnlyCode);
  806. }
  807. @PostMapping(value = "/createRestackMakeResult")
  808. public Map<String, Object> createRestackMakeResult (@RequestParam("keeperId") BigDecimal keeperId,
  809. @RequestParam("beforeLevel") BigDecimal beforeLevel,
  810. @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
  811. @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
  812. @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
  813. @RequestParam("resultRemark") String resultRemark,
  814. @RequestBody(required = false) List < Map < String, Object >> mps){
  815. return wmsFeign.createRestackMakeResult(keeperId, beforeLevel, afterStackingId, afterWarehouseId, afterBeforeStackingId, resultRemark, mps);
  816. }
  817. //修改实时库存,针对倒垛
  818. @PostMapping(value = "/updateWmspGridMaterialForRestack")
  819. public Map<String, Object> updateWmspGridMaterialForRestack (@RequestBody Map < String, Object > mapValue){
  820. return wmsFeign.updateWmspGridMaterialForRestack(mapValue);
  821. }
  822. //修改实时库存,针对倒垛
  823. @PostMapping(value = "/getStockTakingList")
  824. public Map<String, Object> getStockTakingList (@RequestParam(value = "pageNum") Integer pageNum,
  825. @RequestParam(value = "pageSize") Integer pageSize,
  826. @RequestParam(value = "apiId") Integer apiId){
  827. return wmsFeign.getStockTakingList(pageNum, pageSize, apiId);
  828. }
  829. // 根据倒垛单ID获得物资类型
  830. @GetMapping(value = "getRestackMakeTypeResult")
  831. public Map<String, Object> getRestackMakeTypeResult (@RequestParam("restackMake") String restackMake,
  832. @RequestParam("context") String context){
  833. return wmsFeign.getRestackMakeTypeResult(restackMake, context);
  834. }
  835. // 改变已经稽核的吊牌信息
  836. @GetMapping(value = "changeRestackMakeResult")
  837. public int changeRestackMakeResult (@RequestParam("restackMake") String restackMake){
  838. return wmsFeign.changeRestackMakeResult(restackMake);
  839. }
  840. //PDA根据仓库id查找倒垛单
  841. @GetMapping(value = "selectRestackByWarehouseIds")
  842. public Map<String, Object> selectRestackByWarehouseIds(@RequestParam("warehouseid") String warehouseid) {
  843. return wmsFeign.selectRestackByWarehouseIds(warehouseid);
  844. }
  845. //修改实时库存,针对倒垛
  846. @PostMapping(value = "/insertStockTaking")
  847. public Map<String,Object> insertStockTaking(@RequestParam(value = "warehouseId") String warehouseId,
  848. @RequestParam(value = "materialCode") String materialCode,
  849. @RequestParam(value = "quantity") Integer quantity) {
  850. return wmsFeign.insertStockTaking(warehouseId,materialCode,quantity);
  851. }
  852. //修改入库转预留作业,针对预留
  853. @PostMapping(value = "/insertReserved")
  854. public Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
  855. @RequestParam(value = "materialCode") String materialCode,
  856. @RequestParam(value = "materialSpecification") String materialSpecification,
  857. @RequestParam(value = "materialModel") String materialModel,
  858. @RequestParam(value = "quantity") Integer quantity) {
  859. return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity);
  860. }
  861. //修改预留转入库作业,针对预留
  862. @PostMapping(value = "/insertInbounds")
  863. public Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
  864. @RequestParam(value = "materialCode") String materialCode,
  865. @RequestParam(value = "materialSpecification") String materialSpecification,
  866. @RequestParam(value = "materialModel") String materialModel,
  867. @RequestParam(value = "quantity") Integer quantity) {
  868. return wmsFeign.insertInbounds(warehouseId,materialCode,materialSpecification,materialModel,quantity);
  869. }
  870. // 查询所有的钢材物资信息
  871. @PostMapping(value = "/getSteelMaterialList")
  872. public Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
  873. Integer pageNum,
  874. Integer pageSize,
  875. Integer apiId,
  876. Integer warehouseId,
  877. String con) {
  878. return wmsFeign.getSteelMaterialList(mapVal ==null? new HashMap<>():mapVal,pageNum,pageSize,apiId,warehouseId,con);
  879. }
  880. // 查询所有的钢材物资信息
  881. @PostMapping(value = "/getSteelWarehouseList")
  882. public Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
  883. Integer apiId,
  884. Integer pageNum,
  885. Integer pageSize,
  886. String con) {
  887. return wmsFeign.getSteelWarehouseList(mapVal ==null? new HashMap<>():mapVal,apiId,pageNum,pageSize,con);
  888. }
  889. // 查询所有的钢材物资规格型号信息
  890. @PostMapping(value = "/getSteelMaterialModelList")
  891. public Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
  892. @RequestParam(value = "pageNum") Integer pageNum,
  893. @RequestParam(value = "pageSize") Integer pageSize,
  894. @RequestParam(value = "apiId") Integer apiId,
  895. @RequestParam(value = "warehouseId") Integer warehouseId,
  896. @RequestParam(value = "status") Integer status,
  897. @RequestParam(value = "con") String con) {
  898. return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,con);
  899. }
  900. // 根据对应的入库实绩id修改入库状态为预留
  901. @PostMapping("/changeReserved")
  902. @ApiOperation(value = "根据对应的入库实绩id修改入库状态为预留")
  903. public int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList) {
  904. return wmsFeign.changeReserved(mapList);
  905. }
  906. @PostMapping("/getWmsOutboundResultStatistics")
  907. @ApiOperation(value = "展示炉号对应的出厂数量")
  908. @ApiImplicitParams({
  909. @ApiImplicitParam(name = "apiId", value = "446", required = false, dataType = "BigDecimal"),
  910. })
  911. public RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
  912. Integer apiId,
  913. Integer pageNum,
  914. Integer pageSize,
  915. Integer warehouseId,
  916. String con,
  917. String startTime,
  918. String endTime) {
  919. return wmsFeign.getWmsOutboundResultStatistics(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con,startTime,endTime);
  920. }
  921. //删除扫码吊牌
  922. @PostMapping("/undoInbound")
  923. @ApiOperation(value = "删除扫码吊牌")
  924. public Map<String, Object> undoInbound(@RequestParam("inboundId") BigDecimal inboundId){
  925. return wmsFeign.undoInbound(inboundId);
  926. }
  927. }