Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-07-11 5e26543d85895c57d614e2e0cfabf1fbc9423681

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue

@@ -30,14 +30,14 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
const printMerge = props.printMerge
let merge=props.printMerge
if (merge == '') {
  merge = null
}
data.value.printList = JSON.parse(props.printList)
let flowCardCount = data.value.printList.length
onMounted(() => {
      // if (id === null || id === undefined || id === '') {
      //   return
      // }

      request.post(`/processCard/getSelectPrinting`, data.value).then((res) => {
      request.post(`/processCard/getSelectPrinting/${merge}`, data.value).then((res) => {
        if (res.code == 200) {
          produceList.value = deepClone(res.data.data)
          //处理单片厚度

 north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue

@@ -32,6 +32,7 @@
    resizable: true,
    useKey: true
  },
  mouseConfig:{selected: true},
  filterConfig: {   //筛选配置项
   // remote: true
  },
@@ -39,8 +40,8 @@
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    trigger: 'dblclick',
    mode: 'cell',
    showStatus: true
  },//表头参数
  columns:[
@@ -81,6 +82,7 @@
            { code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
            { code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
            { code: 'computedSize', name: '科学计数', prefixIcon: 'vxe-icon-chart-line', visible: true, disabled: false },
            { code: 'paste', name: '粘贴', prefixIcon: 'vxe-icon-paste', visible: true, disabled: false },
          ]
      ]
    }
@@ -125,7 +127,7 @@
      }
    }
  },
  menuClick ({ menu, row, column }) {
  async menuClick ({ menu, row, column }) {
    const $grid = xGrid.value
    if ($grid) {
      switch (menu.code) {
@@ -191,6 +193,33 @@
          }
          break
        }
        case 'paste' :{
          if(xGrid.value.getSelectedCell()===null){
            return
          }
          if(xGrid.value.getSelectedCell().column.editRender===undefined){
            return
          }
          let text = (await navigator.clipboard.readText())
          text = text.split('\r\n')
          text = text.slice(0, text.length - 1)
          console.log(text)
          if(text===null){
            return
          }
          const flag = xGrid.value.getSelectedCell()['_rowIndex']
          const column =xGrid.value.getSelectedCell().column.field
          let i = 0
          xGrid.value.getTableData().visibleData.forEach((item,index)=>{
            if(index>=flag){
              item[column] = text[i]
              i+=1
            }
          })


          break
        }
      }
    }
  }

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java

@@ -178,9 +178,11 @@
    }

    @ApiOperation("打印流程卡数据查询接口")
    @PostMapping("/getSelectPrinting")
    public Result getSelectPrinting(@RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintingSv(object));
    @PostMapping("/getSelectPrinting/{printMerge}")
    public Result getSelectPrinting(
            @PathVariable String printMerge,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge));
    }

    @ApiOperation("打印标签数据查询接口")

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java

@@ -95,6 +95,7 @@
    @ExcelProperty("打印次数")
    private Integer printingNumber;
    @ExcelProperty("创建日期")
    @TableField(update = "false")
    private LocalDate createTime;
    @ExcelProperty("修改日期")
    private LocalDate updateTime;

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java

@@ -72,7 +72,7 @@

    List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);

    List<Map<String, String>> getPrimaryList(String processId, Integer technologyNumber);
    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber);

    List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);

@@ -111,4 +111,6 @@
    List<Map<String, String>> printFlowCardOrderSortMp(String orderId, FlowCard flowCard);

    Boolean printOrderSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);

    List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -233,7 +233,10 @@
            return null;
        }
    }
    public Map<String, Object> getSelectPrintingSv(Map<String, Object> object) {
    public Map<String, Object> getSelectPrintingSv(Map<String, Object> object, String printMerge) {
        if (printMerge == null){
            printMerge= "";
        }
        Map<String, Object> map = new HashMap<>();
        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//最终结果
        List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
@@ -241,7 +244,13 @@
            for (FlowCard flowCard : flowCardList) {
                Map<String, Object> itemmap = new HashMap<>();
                //流程卡表头表尾数据
                itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
                //是否传入合并层数
                if (printMerge.equals("")||printMerge.equals("null") ){
                    itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber())));
                }
                else{
                    itemmap.put("detail", flowCardMapper.getPrimaryListMerge(flowCard.getProcessId(), printMerge));
                }
                //流程卡明细数据
                List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
                //工艺流程

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -163,6 +163,7 @@

    //修改订单数据，并且重新生成多个副表数据
    public void updateOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
        order.setCreateTime(null);
        LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(Order::getOrderId, order.getOrderId());
        orderMapper.update(order,updateWrapper);

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -498,6 +498,17 @@
                 left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
                 left join sd.`order` as o on o.order_id = fc.order_id
                 left join sd.product as p on p.id=od.product_id
                 left join (
            select         ogd.order_id,
                           ogd.order_number,
                           ogd.technology_number,
                           ogd.glass_child,
                           GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
            from sd.order_glass_detail as ogd
            where ogd.order_id = left(#{processId},10)
              and position(ogd.technology_number in #{technologyNumber})
            GROUP BY order_id, order_number
        ) as ogdc on ogdc.order_id=ogd.order_id and ogdc.order_number=ogd.order_number and ogdc.technology_number=ogd.technology_number
        where fc.process_id = #{processId}
          and fc.technology_number = #{technologyNumber}
        group by fc.process_id, fc.technology_number
@@ -827,4 +838,41 @@
          and order_number = #{orderNumber}
          and technology_number = #{technologyNumber}
    </update>

    <select id="getPrimaryListMerge">
        select o.customer_name,
               o.project,
               ogd.process,
               od.edging_type,
               ogdc.concatenated_glass_child as glass_child,
               od.product_name,
               o.processing_note,
               fc.process_id,
               SUM(od.quantity)                                as quantity,
               round(SUM(ogd.total_area), 2)                   as gross_area,
               sum(od.weight)                   as weight,
               #{technologyNumber}                             as technologyNumber,
               concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
                              fc.technology_number = ogd.technology_number
                 left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
                 left join sd.`order` as o on o.order_id = fc.order_id
                 left join sd.product as p on p.id=od.product_id
                 left join (
            select         ogd.order_id,
                           ogd.order_number,
                           ogd.technology_number,
                           ogd.glass_child,
                           GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
            from sd.order_glass_detail as ogd
            where ogd.order_id = left(#{processId},10)
              and position(ogd.technology_number in #{technologyNumber})
            GROUP BY order_id, order_number
        ) as ogdc on ogdc.order_id=ogd.order_id and ogdc.order_number=ogd.order_number and ogdc.technology_number=ogd.technology_number
        where fc.process_id = #{processId}
          and position(fc.technology_number in #{technologyNumber}) and ogdc.concatenated_glass_child is NOT null
        group by fc.process_id, fc.technology_number
    </select>
</mapper>