廖井涛
2024-08-02 3141932b553f2725340ab52050fb19dd4c6d95ca
修改发货单号生成格式
4个文件已修改
52 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -13,6 +13,7 @@
import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue";
import footSum from "@/hook/footSum";
import {changeFilterEvent,filterChanged} from "@/hook"
import companyInfo from "@/stores/sd/companyInfo";
//语言获取
const { t } = useI18n()
@@ -21,6 +22,7 @@
const userStore = useUserInfoStore()
const username = userStore.user.userName
const userid = userStore.user.userId
const company = companyInfo()
let produceList = ref([])
let cellArea = ref()
let otherMoneyVisible = ref(false)
@@ -407,7 +409,8 @@
            delivery: selectRecords,
            title: titleUploadData.value,
            deliveryId: route.query.deliveryID,
            otherMoney:otherMoney.value
            otherMoney:otherMoney.value,
            deliveryIdType:company.deliveryIdType
          })
           request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
@@ -52,6 +52,8 @@
    Integer getmaximum(@Param("type") String type);
    Integer getmaximumMonth();
    Boolean updatedelivery(@Param("area") Double area,
                           @Param("quantity") Integer quantity,
                           @Param("money") Double money,
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -168,6 +168,7 @@
            } else {
                deliveryId = "";
            }
            String deliveryIdType = object.get("deliveryIdType").toString();
            Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class);
            List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class);
            List<DeliveryOtherMoney> deliveryOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(object.get("otherMoney")), DeliveryOtherMoney.class);
@@ -206,7 +207,7 @@
                deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
            } else {
                //获取单号
                oddNumber = orderNumberSetting("发货");
                oddNumber = orderNumberSetting("发货",deliveryIdType);
                //新增发货表数据
                deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
            }
@@ -738,21 +739,34 @@
        }
    }
    public String orderNumberSetting(String type) {
    public String orderNumberSetting(String type,String deliveryIdType) {
        //根据类型自动生成不同的操作单号
        String alias="";
        if(Objects.equals(type, "发货")){
            alias="FH";
        }
        //查询当天的最大数量
        Integer maximum=deliveryMapper.getmaximum(type);
        //设置两位不够补0
        String formattedNumber = String.format("%02d", maximum+1);
        //格式化当前日期
        Date currentDate = new Date();
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
        String formattedDate = dateFormat.format(currentDate);
        String oddNumbers =  alias+formattedDate+formattedNumber;
        String oddNumbers="";
        if(deliveryIdType.equals("day")){
            //查询当天的最大数量
            Integer maximum=deliveryMapper.getmaximum(type);
            //设置两位不够补0
            String formattedNumber = String.format("%02d", maximum+1);
            //格式化当前日期
            Date currentDate = new Date();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
            String formattedDate = dateFormat.format(currentDate);
             oddNumbers =  alias+formattedDate+formattedNumber;
        }else if(deliveryIdType.equals("month")){
            Integer maximum = deliveryMapper.getmaximumMonth();
            String formattedNumber = String.format("%04d", maximum+1);
            Date currentDate = new Date();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyMM");
            String formattedDate = dateFormat.format(currentDate);
            oddNumbers =  alias+formattedDate+formattedNumber;
        }
        return oddNumbers;
    }
}
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -45,6 +45,15 @@
        select count(*) from sd.delivery where  date(create_time)=CURDATE()
    </select>
    <select id="getmaximumMonth">
        select
            ifnull(SUBSTR(max(delivery_id) from 7),0)
        from
            sd.delivery as a
        where
            date(a.create_time)  BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
    </select>
    <select id="getDeliveryConut" >
        select count(*) from sd.delivery where  delivery_id=#{deliveryId}
    </select>