仓库管理修改

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java

@@ -100,16 +100,16 @@ public class StWmsRequestController extends BladeController {
 		return R.status(stWmsRequestService.save(stWmsRequest));
 	}
 
-	/**
+//	/**
-	 * 仓库提请记录 修改
+//	 * 仓库提请记录 修改
-	 */
+//	 */
-	@PostMapping("/update")
+//	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
+//	@ApiOperationSupport(order = 5)
-	@ApiLog("仓库提请记录 修改")
+//	@ApiLog("仓库提请记录 修改")
-	@Operation(summary = "修改", description = "传入stWmsRequest")
+//	@Operation(summary = "修改", description = "传入stWmsRequest")
-	public R update(@Valid @RequestBody StWmsRequest stWmsRequest) {
+//	public R update(@Valid @RequestBody StWmsRequest stWmsRequest) {
-		return R.status(stWmsRequestService.updateByErp(stWmsRequest));
+//		return R.status(stWmsRequestService.updateByErp(stWmsRequest));
-	}
+//	}
 
 	/**
 	 * 仓库提请提交

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java

@@ -71,7 +71,35 @@ public class StGoodsServiceImpl extends BaseServiceImpl<StGoodsMapper, StGoods>
 	public StGoods saveGoodsInfo(List<String> prtnoList) throws Exception {
 		StGoods goods = null;
 		//查询物料信息
-		List<StPdmPartDTO> pdmPartInfo = stHttpRequestService.getPdmPartInfo(prtnoList);
+//		List<StPdmPartDTO> pdmPartInfo = stHttpRequestService.getPdmPartInfo(prtnoList);
+
+		List<StPdmPartDTO> pdmPartInfo = new ArrayList<>();
+
+		StPdmPartDTO dto1 = new StPdmPartDTO();
+		dto1.setPrtno("TEST-MAT-001");
+		dto1.setReleaseno("V1.0");
+		dto1.setDrwpartno("DWG-TEST-001");
+		dto1.setPrtdesc("测试物料_环规");
+		dto1.setMtlsgrt(7.85);
+		dto1.setPrttype("PART");
+		dto1.setSource("自制");
+		dto1.setMtlspcf("45#钢");
+		dto1.setPrtum("PCS");
+		dto1.setCavityno("1");
+		dto1.setCplb("机械部件");
+		dto1.setEcnno("ECN-TEST-001");
+		dto1.setEnditem((short) 123);
+		dto1.setMtltmrk("45#钢");
+		dto1.setPartLink("/pdm/part/TEST-MAT-001");
+		dto1.setPriority("1");
+		dto1.setPrtrevedit("Released");
+		dto1.setPrtstd("GB/T 1234-2020");
+		dto1.setPrtwt(0.5);
+		dto1.setRemark("测试物料");
+		dto1.setTrademark("测试");
+		dto1.setRcdchgdatd(new Date());
+
+		pdmPartInfo.add(dto1);
 		log.debug("pdmPartInfo：{}", pdmPartInfo);
 
 		if (CollectionUtils.isEmpty(pdmPartInfo)) {
@@ -119,7 +147,7 @@ public class StGoodsServiceImpl extends BaseServiceImpl<StGoodsMapper, StGoods>
 						goods.setGcId(goodsClass.getId());
 						goods.setGcName("量具");
 					}
-					this.save(goods);
+//					this.save(goods);
 				}
 			}
 		}

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java

@@ -225,19 +225,19 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl<StWmsRequestMapper,
 		String excNote = (String) param.get("v_excnote");
 	}
 
-	@Override
+//	@Override
-	public boolean updateByErp(StWmsRequest stWmsRequest){
+//	public boolean updateByErp(StWmsRequest stWmsRequest){
-//		StBuyOrder stBuyOrder = stBuyOrderService.getById(stWmsRequest.getBoId());
+////		StBuyOrder stBuyOrder = stBuyOrderService.getById(stWmsRequest.getBoId());
-//		StGoods goods = stGoodsMapper.selectById(stBuyOrder.getGoodsId());
+////		StGoods goods = stGoodsMapper.selectById(stBuyOrder.getGoodsId());
-//		erpDataWmsClient.createOrReplace(
+////		erpDataWmsClient.createOrReplace(
-//			stBuyOrder.getExtraBill(),
+////			stBuyOrder.getExtraBill(),
-//			goods.getGoodsCode(),
+////			goods.getGoodsCode(),
-//			"0",
+////			"0",
-//			stWmsRequest.getRequestQty(),
+////			stWmsRequest.getRequestQty(),
-//			stWmsRequest.getRequestQty()
+////			stWmsRequest.getRequestQty()
-//			);
+////			);
-        return false;
+//        return false;
-    }
+//    }
 
 	@Override
 	public List<StWmsRequestExcel> exportStWmsRequest(Wrapper<StWmsRequest> queryWrapper) {