north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
@@ -114,7 +114,7 @@ </tr> <tr> <th class="title-1">生产单号</th> <th colspan="3">{{data.order.orderId}}</th> <th colspan="3">{{data.order.orderId}}（对应单号{{data.order.batch}}）</th> <th class="title-1">下单日期</th> <th colspan="3">{{data.order.createTime}}</th> <th class="title-1">订单类型</th> @@ -132,8 +132,6 @@ <th>包装</th> <th colspan="3">{{data.order.packType}}</th> </tr> <tr> <th >序号</th> <th >{{company.columnName}}</th> 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> north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -114,6 +114,14 @@ and o.salesman REGEXP #{order.salesman} </if> <if test="order.creator != null and order.creator != ''"> and o.creator REGEXP #{order.creator} </if> <if test="order.verifier != null and order.verifier != ''"> and o.verifier REGEXP #{order.verifier} </if> <if test="order.perimeter != null and order.perimeter != ''"> and o.perimeter REGEXP #{order.perimeter} </if> @@ -202,6 +210,14 @@ and o.salesman REGEXP #{order.salesman} </if> <if test="order.creator != null and order.creator != ''"> and o.creator REGEXP #{order.creator} </if> <if test="order.verifier != null and order.verifier != ''"> and o.verifier REGEXP #{order.verifier} </if> <if test="order.perimeter != null and order.perimeter != ''"> and o.perimeter REGEXP #{order.perimeter} </if>
