md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java

@@ -156,7 +156,52 @@ public class EmisWaybillTransferController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody EmisWaybillTransfer emisWaybillTransfer)
     {
-        return toAjax(emisWaybillTransferService.updateEmisWaybillTransfer(emisWaybillTransfer));
+
+
+        int ret=emisWaybillTransferService.updateEmisWaybillTransfer(emisWaybillTransfer);
+        // 做转单扫描登记
+        /*
+        {
+              "scanType": "80",
+              "opType": "1-检查 2-确认",
+              "scanData": [
+                {
+                  "billCode": "T001,T002,T002",
+                  "transferCode": "转单同行快递代码",
+                  "transferBillcode": "转单同行单号",
+                  "destCity": "目的城市",
+                  "scanDate": "2024-05-02 12:03:05",
+                  "scanWeight": "0.0"
+                }
+              ]
+            }
+         */
+
+        ScanInfo scanInfo = new ScanInfo();
+        List<Map<String,Object>> scanDataList = new ArrayList<>();
+        scanInfo.setOpType(2);
+        scanInfo.setScanType(ScanType.TRANSFER.opCode);
+        Map<String,Object> scanDateItem = new HashMap<>();
+        scanDateItem.put("billCode",emisWaybillTransfer.getBillCode());
+        scanDateItem.put("transferCode",emisWaybillTransfer.getTransferExpress());
+        scanDateItem.put("transferBillcode",emisWaybillTransfer.getTransferBillCode());
+        scanDateItem.put("destCity",emisWaybillTransfer.getTransferCity());
+        scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
+        scanDateItem.put("scanWeight", "0.0");
+        scanDataList.add(scanDateItem);
+        scanInfo.setScanData(scanDataList);
+
+        try {
+            emisTmsScanRecordService.scan(scanInfo);
+        } catch (EmisBizError emisBizError) {
+            emisBizError.printStackTrace();
+            return AjaxResult.error(emisBizError.getMessage());
+        }catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error("数据异常!");
+        }
+
+        return AjaxResult.success("成功",ret);
     }
 
     /**

emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml

@@ -138,11 +138,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteEmisWaybillTransferById" parameterType="Long">
-        delete from emis_waybill_transfer where id = #{id}
+        update emis_waybill_transfer set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisWaybillTransferByIds" parameterType="String">
-        delete from emis_waybill_transfer where id in 
+        update emis_waybill_transfer set del_flag='1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>