关务系统bug修改

src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java

@@ -105,6 +105,12 @@ public class CoDelController {
         return R.ok();
     }
 
+    @PostMapping("/updateEcssDel")
+    public R updateEcssDel(@RequestBody EcssCoDelNotifyHeaderData data) {
+        coDelService.updateEcssDel(data);
+        return R.ok();
+    }
+
     @PostMapping("/cancerConfirmEcssDel")
     public R cancerConfirmEcssDel(@RequestBody EcssCoDelNotifyHeaderData data) {
         coDelService.cancerConfirmEcssDel(data);

src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java

@@ -38,7 +38,7 @@ public interface CoDelMapper {
     void batchSaveEcssCoDelNotifyDetail(List<EcssCoDelNotifyData> list );
     List<PartData> checkPart(@Param("site") String site, @Param("partNo") String partNo);
 
-    List<PartData> getPartNo(@Param("site") String site, @Param("partNo") String partNo);
+    List<PartData> getPartNo(@Param("site") String site, @Param("partNo") String partNo, @Param("userName") String userName);
 
     List<PartData> getPartInfo(@Param("site") String site, @Param("partNo") String partNo);
 
@@ -52,6 +52,9 @@ public interface CoDelMapper {
     void deleteEcssDelDetail(EcssCoDelNotifyDetail data);
 
     void confirmEcssDel(EcssCoDelNotifyHeaderData data);
+
+    void updateEcssDel(EcssCoDelNotifyHeaderData data);
+
     IPage<EcssHsCodeData> searchHsCodeData(Page<EcssHsCodeData> ecssHsCodeDataPage, @Param("query") EcssHsCodeData data);
 
     List<EcssHsCodeData> checkHsCodeDescData(EcssHsCodeData inData);

src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java

@@ -36,6 +36,8 @@ public interface CoDelService {
 
     void confirmEcssDel(EcssCoDelNotifyHeaderData data);
 
+    void updateEcssDel(EcssCoDelNotifyHeaderData data);
+
     void cancerConfirmEcssDel(EcssCoDelNotifyHeaderData data);
 
     PageUtils searchHsCodeData(EcssHsCodeData data);

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

@@ -168,7 +168,7 @@ public class CoDelServiceImpl implements CoDelService {
                 task.setStatus(getStringCellValue(row, 6));
                 task.setFamily(getStringCellValue(row, 7));
                 task.setPn(getStringCellValue(row, 8));
-                List<PartData> parts = coDelMapper.getPartNo(site, task.getPn());
+                List<PartData> parts = coDelMapper.getPartNo(site, task.getPn(),currentUser.getUsername());
                 if (parts.isEmpty()) {
                     throw new RuntimeException("导入失败：物料：" + task.getPn() + "不存在！");
                 }
@@ -353,6 +353,18 @@ public class CoDelServiceImpl implements CoDelService {
         coDelMapper.confirmEcssDel(data);
     }
 
+    @Override
+    public void updateEcssDel(EcssCoDelNotifyHeaderData data) {
+        List<EcssCoDelNotifyHeaderData> checkHeader = coDelMapper.checkEcssCoDelNotifyHeaderByDelNo(data.getSite(), data.getDelNo());
+        if (checkHeader.size() == 0) {
+            throw new RuntimeException("不存在该发货通知单请刷新界面");
+        }
+        if (!"仓库已确认".equals(checkHeader.get(0).getNotifyStatus())) {
+            throw new RuntimeException("发货通知单状态不为仓库已确认，请刷新页面。");
+        }
+        coDelMapper.updateEcssDel(data);
+    }
+
     @Override
     public void cancerConfirmEcssDel(EcssCoDelNotifyHeaderData data) {
         List<EcssCoDelNotifyHeaderData> checkHeader = coDelMapper.checkEcssCoDelNotifyHeaderByDelNo(data.getSite(), data.getDelNo());
@@ -567,7 +579,7 @@ public class CoDelServiceImpl implements CoDelService {
                 excelData.setPalletRemark(getStringCellValue(row, 2));
                 excelData.setPoNo(getStringCellValue(row, 3));
                 excelData.setPn(getStringCellValue(row, 4));
-                List<PartData> parts = coDelMapper.getPartNo(excelData.getSite(), excelData.getPn());
+                List<PartData> parts = coDelMapper.getPartNo(excelData.getSite(), excelData.getPn(),currentUser.getUsername());
                 if (parts.isEmpty()) {
                     throw new RuntimeException("导入失败：物料：" + excelData.getPn() + "不存在！");
                 }
@@ -853,7 +865,7 @@ public class CoDelServiceImpl implements CoDelService {
         }
         for (int i = 0; i < rows.size(); i++) {
             if (rows.get(i).getHsCode() == null) {
-                throw new RuntimeException("存在物料未维护HSCODE！");
+                throw new RuntimeException("存在物料未维护HS Code！");
             }
         }
         Map<String, EcssDeclarationDetailData> dataMap = rows.stream()
@@ -1124,8 +1136,9 @@ public class CoDelServiceImpl implements CoDelService {
             template.setPriceRight(true);
 
             EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(data.getSite(), data.getDelNo());
-            template.addVar("localShipper", stringInput(ecHeader.getLocalShipper()));
-            template.addVar("localShipAddress", stringInput(ecHeader.getLocalShipAddress()));
+            List<Map> addrs = coDelMapper.getCustomerAdd(notifyHeader.getCustomerName());
+            template.addVar("localShipper", notifyHeader.getCustomerName());
+            template.addVar("localShipAddress", addrs.get(0).get("cDeliverAdd"));
             template.addVar("ccusname", stringInput(ecHeader.getOverseasShipper()));
             template.addVar("cDeliverAdd", stringInput(ecHeader.getOverseasAddress()));
             template.addVar("cmc_invoice", notifyHeader.getCmcInvoice());
@@ -1188,8 +1201,9 @@ public class CoDelServiceImpl implements CoDelService {
             template.setRangeStyle(true);
             // 发货通知单
             EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(data.getSite(), data.getDelNo());
-            template.addVar("localShipper", stringInput(ecHeader.getLocalShipper()));
-            template.addVar("localShipAddress", stringInput(ecHeader.getLocalShipAddress()));
+            List<Map> addrs = coDelMapper.getCustomerAdd(notifyHeader.getCustomerName());
+            template.addVar("localShipper", notifyHeader.getCustomerName());
+            template.addVar("localShipAddress", addrs.get(0).get("cDeliverAdd"));
             template.addVar("ccusname", stringInput(ecHeader.getOverseasShipper()));
             template.addVar("cDeliverAdd", stringInput(ecHeader.getOverseasAddress()));
             template.addVar("dateStr", DateUtils.format(notifyHeader.getReadyDate(), "yyyy-MM-dd"));
@@ -1409,8 +1423,9 @@ public class CoDelServiceImpl implements CoDelService {
             List<Map> detailList = coDelMapper.exportDeclarationDetail(data);
             // 发货通知单
             EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(data.getSite(), data.getDelNo());
-            template.addVar("localShipper", stringInput(ecHeader.getLocalShipper()));
-            template.addVar("localShipAddress", stringInput(ecHeader.getLocalShipAddress()));
+            List<Map> addrs = coDelMapper.getCustomerAdd(notifyHeader.getCustomerName());
+            template.addVar("localShipper", notifyHeader.getCustomerName());
+            template.addVar("localShipAddress", addrs.get(0).get("cDeliverAdd"));
             template.addVar("ccusname", stringInput(ecHeader.getOverseasShipper()));
             template.addVar("cDeliverAdd", stringInput(ecHeader.getOverseasAddress()));
             // 装箱数据
@@ -1558,7 +1573,7 @@ public class CoDelServiceImpl implements CoDelService {
             List<PartData> partList = coDelMapper.getPartInfo(inData.getSite(),partNo);
             List<EcssPackageData> packageDataList = coDelMapper.getPackage(inData.getSite(),inData.getBuNo(),partList.get(0).getPackageNo());
             if (packageDataList.isEmpty()) {
-                throw new RuntimeException("物料["+partNo+"]未维护包装箱信息！");
+                throw new RuntimeException("物料["+partList.get(0).getSku()+"]未维护包装箱信息！");
             }
             PartSubPropertiesValueData propertiesWeight = partNoAndItemNoMap.get(partNo + "$ROLLWEIGHT");//每卷重量
             PartSubPropertiesValueData propertiesRollQty = partNoAndItemNoMap.get(partNo + "$ROLLQTY");//每卷数量
@@ -1567,7 +1582,7 @@ public class CoDelServiceImpl implements CoDelService {
             PartSubPropertiesValueData propertiesEUcs = partNoAndItemNoMap.get(partNo + "$EUPALLETCENGSHU");//eu每托层数
             PartSubPropertiesValueData propertiesUScs = partNoAndItemNoMap.get(partNo + "$EUPALLETCENGSHU");//us每托层数
             if (propertiesWeight==null||propertiesRollQty==null||propertiesBoxRolls==null||propertiesBoxWeight==null) {
-                throw new RuntimeException("请先维护物料["+partNo+"]基本信息！");
+                throw new RuntimeException("请先维护物料["+partList.get(0).getSku()+"]基本信息！");
             }
             EcssCoDelPalletHeaderData headerData = new EcssCoDelPalletHeaderData();
             BeanUtils.copyProperties(inData, headerData);

src/main/resources/mapper/ecss/CoDelMapper.xml

@@ -188,7 +188,9 @@
     </select>
 
     <select id="getPartNo" resultType="PartData">
-        select top 1 site,part_no from Part where site=#{site,jdbcType=VARCHAR} and sku=#{partNo}
+        select top 1 site,part_no from Part where site=#{site,jdbcType=VARCHAR} and sku=#{partNo} and
+                                                  site in (select site from eam_access_site where username = #{userName})
+                                              and (site + '-' + sourceBu) in (select * from dbo.query_bu(#{userName}))
     </select>
 
     <select id="getPartInfo" resultType="PartData">
@@ -232,6 +234,11 @@
         update ecss_CoDelNotifyHeader set  notify_status=#{notifyStatus} ,notifyDate=#{notifyDate,jdbcType=TIMESTAMP} where site=#{site} and delNo=#{delNo}
     </update>
 
+    <update id="updateEcssDel">
+        update ecss_CoDelNotifyHeader set ready_date=#{readyDate,jdbcType=TIMESTAMP}
+        where site=#{site} and delNo=#{delNo}
+    </update>
+
 
       <select id="searchHsCodeData"   resultType="EcssHsCodeData">
         select a.Site,a.BuNo,a.HsCode,a.Remark,a.CreateBy,a.CreateDate,a.UpdateBy,a.UpdateDate,a.codeNo
@@ -443,7 +450,7 @@ create_by,create_date,update_by,update_date
     </update>
     <update id="updateCodelPalletDetail">
         update ecss_CoDelPalletDetail set  part_no=#{partNo},qty=#{qty,jdbcType=DECIMAL},po_no=#{poNo},
-        box_qty=#{boxQty,jdbcType=DECIMAL},update_by=#{updateBy},update_date=GetDate(),rolls=#{rolls}
+        box_qty=#{boxQty,jdbcType=DECIMAL},update_by=#{updateBy},update_date=GetDate(),rolls=#{rolls},pn=#{pn}
         where site =#{site} and bu_no=#{buNo} and delNo=#{delNo} and seq_no=#{seqNo} and item_no=#{itemNo}
     </update>
     <delete id="deletePalletHeader">
@@ -751,11 +758,11 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
     </update>
 
     <select id="getNotifyPartDetail"  resultType="java.util.Map">
-        select a.part_no as partNo,b.hsCode,a.site,a.delNo,a.lossratio,a.ehundred,b.part_desc
+        select a.part_no as partNo,b.hsCode,a.site,a.delNo,a.lossratio,a.ehundred,b.part_desc,a.pn
         from ecss_CoDelNotifydetail a
                  left join part b on a.site=b.site and a.part_no=b.part_no
         where a.site = #{site} AND a.delNo = #{delNo}
-        group by a.part_no,b.hsCode,a.site,a.delNo,a.lossratio,a.ehundred,b.part_desc
+        group by a.part_no,b.hsCode,a.site,a.delNo,a.lossratio,a.ehundred,b.part_desc,a.pn
     </select>
 
     <select id="getPropertiesListByTypeAndCodeNo" resultType="com.xujie.sys.modules.part.entity.PartSubPropertiesValueData">

src/main/resources/mapper/part/PartInformationMapper.xml

@@ -1069,7 +1069,7 @@
     </insert>
 
     <update id="savePartHSCode">
-        update Part set hsCode=#{hsCode},hsCodeDesc=#{hsCodeDesc}
+        update Part set hsCode=#{hsCode},hsCodeDesc=#{hsCodeDesc},packageNo=#{packageNo}
         where site = #{site} and part_no = #{partNo}
     </update>
 </mapper>