Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesContainerSnBindController.java

@@ -92,7 +92,7 @@ public class MesContainerSnBindController {
             ValidatorBean.checkNotNull(model.getUserName(), "操作人不能为空");
             ValidatorBean.checkNotNull(model.getPackageDetails(), "请选择要删除的条码");
             model = containerSnBindService.doDeleteDetails(model);
-            return ResultBean.success("删除成功成功").setResultObject(model);
+            return ResultBean.success("删除成功").setResultObject(model);
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesContainerSnStationServiceImpl.java

@@ -291,7 +291,7 @@ public class MesContainerSnStationServiceImpl implements IMesContainerSnStationS
 
     @Override
     public void checkStation(String organizeCode, String station) {
-        if (!mesContainerSnStationRepository.isExitByProperty(new String[]{MesConstWords.ORGANIZE_CODE, MesConstWords.IS_VALID, MesConstWords.IS_DELETED, "station"},
+        if (!mesStationRDao.isExitByProperty(new String[]{MesConstWords.ORGANIZE_CODE, MesConstWords.IS_VALID, MesConstWords.IS_DELETED, "station"},
                 new Object[]{organizeCode, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), station})) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesContainerSnBindServiceImpl.java

@@ -56,6 +56,8 @@ public class MesContainerSnBindServiceImpl implements IMesContainerSnBindService
     private EntityManager entityManager;
     @Autowired
     private SnowflakeIdMaker snowflakeIdMaker;
+    @Autowired
+    protected MesContainerPackageDetailFeedingRepository packageDetailFeedingRDao;
 
     private MesContainerPackage getContainerPackage(MesContainerSnBindModel model, String containerSn) {
         MesContainerPackage containerPackage = containerPackageRDao.getByProperty(
@@ -239,6 +241,16 @@ public class MesContainerSnBindServiceImpl implements IMesContainerSnBindService
             List<MesContainerPackageDetail> packageDetails = containerPackageDetailRDao.findByProperty(
                     new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, "pid", "snStatus"},
                     new Object[]{model.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), containerPackage.getId(), MesExtEnumUtil.CONTAINER_BARCODE_STATUS.STATUS_10.getValue()});
+            for (MesContainerPackageDetail detail : packageDetails) {
+                if (detail.getQty() == null) {
+                    detail.setQty(0.0);
+                }
+                MesContainerPackageDetailFeeding feeding = packageDetailFeedingRDao.getByProperty(new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, "pid", "sourceId"},
+                        new Object[]{model.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), detail.getPid(), detail.getId()});
+                if (feeding != null && feeding.getQty() != null) {
+                    detail.setQty(detail.getQty() - feeding.getQty());
+                }
+            }
             model.setPackageDetails(packageDetails);
         }