预期到货通知单修改

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java

@@ -18,11 +18,6 @@ public class WmsAnsBillDto {
 
     private String sid;
     private String createBySid;
-    private String orgPath;
-    @ApiModelProperty("销售部门sid")
-    private String createDeptSid;
-    @ApiModelProperty("销售部门")
-    private String createDeptName;
 
     @ApiModelProperty("外部单号（业务单据编号）")
     private String sourceBillNo;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.java

@@ -21,4 +21,6 @@ public interface WmsAnsBillMapper extends BaseMapper<WmsAnsBill> {
     IPage<WmsAnsBillVo> listPages(IPage<WmsAnsBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsAnsBill> qw);
 
     WmsAnsDetailsVo details(String sid);
+
+    String selectNum(String bill);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml

@@ -45,4 +45,12 @@
         from wms_ans_bill wab
         where sid = #{sid}
     </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT(billNo, 4)
+        from wms_ans_bill
+        where billNo LIKE concat(#{bill}, '%')
+        order by id desc
+        limit 1
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java

@@ -13,6 +13,10 @@ import com.yxt.wms.biz.inventory.wmsansbilldetail.*;
 import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBill;
 import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillQuery;
 import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillVo;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.wms.utils.BillNo;
+import com.yxt.wms.utils.Rule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +33,8 @@ public class WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsA
 
     @Autowired
     private WmsAnsBillDetailService wmsAnsBillDetailService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public ResultBean<String> saveOrUpdateBill(WmsAnsBillDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
@@ -44,6 +50,8 @@ public class WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsA
             } else {
                 return rb.setMsg("单据明细不能为空");
             }
+            String billNo = getApplyCode(wmsAnsBill.getCreateOrgSid());
+            wmsAnsBill.setBillNo(billNo);
             baseMapper.insert(wmsAnsBill);
 
         } else {
@@ -65,6 +73,23 @@ public class WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsA
         return rb.success().setData(sid);
     }
 
+    private String getApplyCode(String createOrgSid) {
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(createOrgSid);
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType("YGDHTZD");
+        String bill = Rule.getBill(b);
+        String i = baseMapper.selectNum(bill);
+        String billNo = "";
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(bill, 0);
+        }
+        return billNo;
+    }
+
     public PagerVo<WmsAnsBillDetailVo> listPage(PagerQuery<WmsAnsBillDetailQuery> pagerQuery) {
         WmsAnsBillDetailQuery query = pagerQuery.getParams();
         QueryWrapper<WmsAnsBillDetail> qw = new QueryWrapper<>();

yxt-wms-biz/src/main/java/com/yxt/wms/utils/BillNo.java

@@ -0,0 +1,22 @@
+package com.yxt.wms.utils;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/1 9:46
+ * @Description
+ */
+@Data
+public class BillNo implements Serializable {
+    private static final long serialVersionUID = 1598887042562656350L;
+    
+    @ApiModelProperty(value = "单据名称首字母")
+    private String billType;
+    @ApiModelProperty(value = "分公司编码")
+    private String orgCode;
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/utils/Rule.java

@@ -1,5 +1,8 @@
 package com.yxt.wms.utils;
 
+import cn.hutool.core.date.DateUtil;
+import org.springframework.util.StringUtils;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -12,4 +15,16 @@ public class Rule {
         String billNo = bill + num;
         return billNo;
     }
+
+    public static String getBill(BillNo b) {
+        String billType = b.getBillType();
+        String orgCode = b.getOrgCode();
+        String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+        String bill = billType;
+        if (!StringUtils.isEmpty(orgCode)) {
+            bill = bill + orgCode;
+        }
+        bill = bill + date;
+        return bill;
+    }
 }