guoyujie
2025-08-22 b9c6763dd7b4ef2c0fc70f2dbc5739666b28643c
提交 装箱打印显示不同批次
6个文件已修改
34 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
@@ -24,6 +24,7 @@
const name2=ref("admin")
const printStyle = ref(null);
const title = ref({})
@@ -43,7 +44,6 @@
data.value.printList = JSON.parse(props.printList)
console.log(data.value.printList)
onMounted(() => {
  clearPrintStyles()
@@ -149,14 +149,15 @@
const orderDetailList = ref([])
const customer = ref({})
const selectPrint =async () => {
  const page = props.printPage==='storageRecordPint'?`/finishedGoodsInventory/getSelectPrints`:'/finishedGoodsInventory/getInventoryPrints'
  const page1 = props.printPage==='storageRecordPint'?`/finishedGoodsInventory/getSelectPrints`:'/finishedGoodsInventory/getInventoryPrints'
  const value = props.printPage==='storageRecordPint'?data.value:data.value.printList
  request.post(page, value).then((res) => {
  request.post(page1, value).then((res) => {
    if (res.code == 200) {
      produceList.value = deepClone(res.data.data)
      customer.value = produceList.value[0].detail[0]
      let height = 0
      let index = 0
      console.log(res.data.data)
      for(let i=0;i<produceList.value.length;i++){
        //换产品就换页
        if(i>0){
@@ -221,6 +222,8 @@
          type:'sum',
          sum:sum
        })
        console.log(page)
      })
    } else {
      ElMessage.warning(res.msg)
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
@@ -150,7 +150,7 @@
    Integer findOrderNumberdContainercount(String orderId, Integer orderNumber, String container);
    List<Map<String, String>> getPrintTitleByBox(Integer customerId, String project, String boxNo);
    List<Map<String, String>> getPrintTitleByBox(Integer customerId, String project, String boxNo,String orderId);
    List<Map<String, Object>> getorderProductByBoxNo(String orderId, String boxNo);
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -1186,7 +1186,8 @@
                itemmap.put("detail",finishedGoodsInventoryMapper.getPrintTitleByBox(
                        finishedGoodsInventory.getOrder().getCustomerId(),
                        finishedGoodsInventory.getOrder().getProject(),
                        boxNo
                        boxNo,
                        orderId
                ) );
                //获取库存里面此订单此箱号的所有产品信息
                List<Map<String, Object>> detailList = finishedGoodsInventoryMapper
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -1249,12 +1249,12 @@
    }
        public List<BasicDataProduce> selectEquipmentByProcessSv(String process) {
               return reportingWorkMapper.SelectWorkBasicDeviceMp(process);
            }
    public List<BasicDataProduce> selectEquipmentByProcessSv(String process) {
           return reportingWorkMapper.SelectWorkBasicDeviceMp(process);
        }
        public String saveWorkStorage(Map<String, Object> object) {
                //List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
                //finishedGoodsInventoryService.addSelectWarehousing(object);
                return null;
            }}
    public String saveWorkStorage(Map<String, Object> object) {
            //List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
            //finishedGoodsInventoryService.addSelectWarehousing(object);
            return null;
        }}
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -1078,7 +1078,7 @@
                 o.customer_name,
                 o.customer_id,
                 o.project,
                 o.batch,
                 (select p.batch from sd.`order` p where p.order_id =#{orderId}) as batch,
                 fol.box_no as 'remarks',
                 SUM(fol.quantity_available) as quantity,
                 ROUND( sum(od.width * od.height * fol.quantity_available) / 1000000, 2 ) as area,
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -35,6 +35,7 @@
        <result column="delivery_address" property="order.deliveryAddress"/>
        <result column="project" property="order.project"/>
        <result column="customer_name" property="order.customerName"/>
        <result column="customer_Id" property="order.customerId"/>
    </resultMap>
@@ -760,6 +761,7 @@
        od.height,
        o.project,
        o.customer_name,
        o.customer_Id,
        o.delivery_address,
        fol.operate_time,
        fol.`status`,