From fbad45bd59718111bc6f9a2e024d3ab8c2356481 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 31 Oct 2024 18:00:23 +0800 Subject: [PATCH] =?UTF-8?q?wms=E9=87=87=E8=B4=AD=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=EF=BC=88SRM=EF=BC=89=E5=88=B0=E8=B4=A7=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=94=B9=E8=BF=9B=EF=BC=8C=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E2=80=9C=E6=95=B4=E5=BC=A0=E9=80=81=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E4=B8=80=E9=94=AE=E6=8A=A5=E6=A3=80=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E9=80=89=E6=8B=A9=E5=92=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E5=AD=97=20=E5=8A=A0=E6=A0=87=E8=AF=86=E5=8D=A1?= =?UTF-8?q?=E7=9A=84=E6=89=93=E5=8D=B0=E9=A1=BA=E5=BA=8F=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=EF=BC=9A7=E5=BC=A0=E6=A0=87=E8=AF=86=E5=8D=A1=E7=9A=84?= =?UTF-8?q?=E8=AF=9D=EF=BC=8C=E5=B0=B1=E6=98=AF7-1=E3=80=817-2=E3=80=817-3?= =?UTF-8?q?=E8=BF=99=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BpRawMaterialInController.java | 4 +- .../BpRawMaterialInDetailController.java | 4 +- .../controller/WmsToWCSmissionController.java | 7 ++ .../op/wms/mapper/OdsProcureOrderMapper.java | 18 ++--- .../wms/service/IOdsProcureOrderService.java | 2 + .../impl/OdsProcureOrderServiceImpl.java | 69 +++++++++++++++++++ .../impl/WmsProductPutServiceImpl.java | 3 +- .../mapper/wms/OdsProcureOrderMapper.xml | 7 ++ 8 files changed, 101 insertions(+), 13 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInController.java index 72b576a00..d37ba3498 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInController.java @@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.common.security.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; + import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -25,7 +25,7 @@ import com.op.common.core.web.page.TableDataInfo; /** * 白坯原材料入库Controller - * + * * @author ruoyi * @date 2024-10-28 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInDetailController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInDetailController.java index e038b8236..b0fd2bd8c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInDetailController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInDetailController.java @@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.microsoft.windowsazure.exception.ServiceException; import com.op.common.security.annotation.RequiresPermissions; -import org.springframework.security.access.prepost.PreAuthorize; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -26,7 +26,7 @@ import com.op.common.core.web.page.TableDataInfo; /** * 白坯原材料入库明细Controller - * + * * @author ruoyi * @date 2024-10-29 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 9297e2a57..c58812647 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -138,6 +138,13 @@ public class WmsToWCSmissionController { String result = odsProcureOrderService.ArrivalRegistration(odsProcureOrder); return success(result); } + @PostMapping("/ArrivalRegistrationSH") + public AjaxResult ArrivalRegistrationSH(@RequestBody OdsProcureOrder odsProcureOrder) { +// odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder); +// return success(); + String result = odsProcureOrderService.ArrivalRegistrationSH(odsProcureOrder); + return success(result); + } /** * 手持 －查询到货登记记录--已登记数量 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java index bf39355d6..51614d473 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java @@ -90,21 +90,23 @@ public interface OdsProcureOrderMapper { */ public List selectOdsProcureOrderList1(OdsProcureOrder odsProcureOrder); - OdsProcureOrder selectOdsProcureOrderCardByUserDefined1(OdsProcureOrder odsProcureOrder); + public OdsProcureOrder selectOdsProcureOrderCardByUserDefined1(OdsProcureOrder odsProcureOrder); - List getIdCardByIdList(@Param("storageId")String storageId); + public List getIdCardByIdList(@Param("storageId")String storageId); - OdsProcureOrder selectOdsProcureOrderCardTL(OdsProcureOrder odsProcureOrder); + public OdsProcureOrder selectOdsProcureOrderCardTL(OdsProcureOrder odsProcureOrder); - OdsProcureOrder selectWMSOdsProcureReturnOrderByID(String id); + public OdsProcureOrder selectWMSOdsProcureReturnOrderByID(String id); - List getIdCardListTH(OdsProcureOrder order); + public List getIdCardListTH(OdsProcureOrder order); - void deleteBatchPallet(@Param("list")List dtos0); + public void deleteBatchPallet(@Param("list")List dtos0); - List getIdCardListByU1(OdsProcureOrder order); + public List getIdCardListByU1(OdsProcureOrder order); - String selectOdsProcureOrderUserDefined7New(@Param("formattedTEM")String formattedDate); + public String selectOdsProcureOrderUserDefined7New(@Param("formattedTEM")String formattedDate); + + public List selectOdsProcureOrderListSH(OdsProcureOrder order2); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java index 30418d049..f46155cd8 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java @@ -141,4 +141,6 @@ public interface IOdsProcureOrderService { String NewConMaterialOutSCNew(List orderList, List gzList); List CKlist(OdsProcureOutOrder odsProcureOutOrder); + + String ArrivalRegistrationSH(OdsProcureOrder odsProcureOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 475778059..d2cbf0b1b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -1179,6 +1179,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } if(!CollectionUtils.isEmpty(dtos)){ + int tem= dtos.size(); + int ken=1; + for (OdsProcureOrder order1: + dtos) { + order1.setUserDefined9(tem+"-"+ken); + System.out.print(tem+"-"+ken); + ken++; + } odsProcureOrderMapper.addBatchPallet(dtos); } }else{ @@ -1225,6 +1233,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } if(!CollectionUtils.isEmpty(dtos)){ + int tem= dtos.size(); + int ken=1; + for (OdsProcureOrder order1: + dtos) { + order1.setUserDefined9(tem+"-"+ken); + System.out.print(tem+"-"+ken); + ken++; + } odsProcureOrderMapper.addBatchPallet(dtos); } } @@ -1262,6 +1278,16 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { String dateString = order1.getUserDefined11().replace("-", ""); order1.setUserDefined1(order1.getProcureCode()+"-"+order1.getUserDefined3()+"-"+order1.getUserDefined8()+"-"+dateString+"-"+order1.getUserDefined4()+"-"+order1.getCardNum());//采购单+行项目+类型+日期+板次 order1.setUserDefined10("0"); + if ( order1.getUserDefined9()!=null){ + String userDefined9= order1.getUserDefined9(); + String[] userDefined9s= userDefined9.split("-"); + String firstValue = userDefined9s[0]; + String secondValueStr = userDefined9s[1]; // 获取第二个值的字符串 + int secondValue = Integer.parseInt(secondValueStr); // 转换为整数 + secondValue += 1; // 加1 + order1.setUserDefined9(firstValue+secondValue); + } + dtos.add(order1); odsProcureOrderMapper.addBatchPallet(dtos); for (OdsProcureOrder odsProcureOrder1: @@ -2506,6 +2532,49 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return orderList; } + @Override + public String ArrivalRegistrationSH(OdsProcureOrder odsProcureOrder) { + String result="操作成功"; + DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + OdsProcureOrder order2=new OdsProcureOrder(); + order2.setUserDefined5(odsProcureOrder.getUserDefined5()); + List orderList= odsProcureOrderMapper.selectOdsProcureOrderListSH(order2); + for ( OdsProcureOrder odsProcureOrder1 : + orderList) { + OdsProcureOrder order=new OdsProcureOrder(); + order.setProcureCode(odsProcureOrder1.getProcureCode()); + order.setActive("1"); + OdsProcureOrder order1= odsProcureOrderMapper.selectOdsProcureOrderByID(odsProcureOrder1.getID()); + + //查询这次收货信息----生成质检任务------- //插入检验集计划 + QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO = new QcCheckTaskIncomeDTO(); + qcCheckTaskIncomeDTO.setCheckLoc("mjtest"); + qcCheckTaskIncomeDTO.setCheckType("checkTypeLL"); + qcCheckTaskIncomeDTO.setSupplierCode(order1.getSupplierCode()); + String name = odsProcureOrderMapper.selectBaseSupplier(order1); + qcCheckTaskIncomeDTO.setSupplierName(name); + qcCheckTaskIncomeDTO.setOrderType("8040");//包材固定码 + qcCheckTaskIncomeDTO.setUnit(order1.getUnit()); + qcCheckTaskIncomeDTO.setFactoryCode(odsProcureOrder.getFactoryCode()); + qcCheckTaskIncomeDTO.setQuality(odsProcureOrder1.getPlanNumber());//操作数量 + qcCheckTaskIncomeDTO.setMaterialCode(order1.getMaterialCode()); + qcCheckTaskIncomeDTO.setMaterialName(order1.getMaterialDesc()); + // qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2()); + qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()); + qcCheckTaskIncomeDTO.setIncomeTime(new Date()); + R ruslt= remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); +// 成功后修改-- + if (ruslt.getCode()==200){//成功 + odsProcureOrder1.setCzNumber(odsProcureOrder1.getPlanNumber()); + odsProcureOrder1.setLastUpdateBy(odsProcureOrder.getLastUpdateBy()); + odsProcureOrderMapper.updateOdsProcureOrderAddOperationNumber(odsProcureOrder1); + }else { + result="操作失败:"+ruslt.getMsg(); + } + } + return result; + } + // @Override // public String addReturnSC(List orderList) { // String factoryCode = orderList.get(0).getFactoryCode(); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index af94faad2..e10cea4f8 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -652,6 +652,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { String result="入库成功"; //先判断这个订单是否存在//如果存在--就修改订单。-如果不存在就添加上， DynamicDataSourceContextHolder.push("ds_" + wmsOdsWhiteEmbryoIn.getSiteCode()); + String userDefined1= wmsOdsWhiteEmbryoIn.getUserDefined1(); WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn1= wmsOdsWhiteEmbryoInMapper.selectWmsOdsWhiteEmbryoInByOrderCodeAndUserDefined1(wmsOdsWhiteEmbryoIn); if (wmsOdsWhiteEmbryoIn1==null){ //原来不存在 @@ -688,7 +689,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsOdsEmStorageNewsSn.setMaterialCode(wmsOdsWhiteEmbryoIn.getMaterialCode()); wmsOdsEmStorageNewsSn.setMaterialDesc(wmsOdsWhiteEmbryoIn.getMaterialDesc()); wmsOdsEmStorageNewsSn.setSn(wmsWhiteBilletInfor.getSn()); - wmsOdsEmStorageNewsSn.setBarCode(wmsWhiteBilletInfor.getBatchCode()); + wmsOdsEmStorageNewsSn.setBarCode(userDefined1); wmsOdsEmStorageNewsSn.setAmount(new BigDecimal(wmsWhiteBilletInfor.getBatchQuantity())); wmsOdsEmStorageNewsSn.setCreateBy(wmsOdsWhiteEmbryoIn.getCreateBy()); wmsOdsEmStorageNewsSn.setGmtCreate(new Date()); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index 8892de814..f85a624e4 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -803,5 +803,12 @@ WHERE LEFT(User_Defined7, 6) = #{formattedTEM} + +