Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-04-02 e1f5a5949bc144878307da10a0cdafc410a3647a

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue

@@ -646,17 +646,28 @@
            ElMessage.error("请输入库存区域")
            return
          }*/
          let  flowData
          if(selectRecords.height===undefined){
              flowData = ref({

              title: titleUploadData.value,
              materialCode: selectRecords.id,
              userName:userStore.user.userName,
              userId:userStore.user.userId

          let  flowData = ref({
            totalArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2))*titleUploadData.value.inventoryQuantity,
            singlePieceArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2)),
            title: titleUploadData.value,
            materialCode: selectRecords.id,
            userName:userStore.user.userName,
            userId:userStore.user.userId
            })
          }else{
              flowData = ref({
                totalArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2))*titleUploadData.value.inventoryQuantity,
                singlePieceArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2)),
              title: titleUploadData.value,
              materialCode: selectRecords.id,
              userName:userStore.user.userName,
              userId:userStore.user.userId

          })
            })
          }

          console.log(flowData.value)

          request.post("/materialInventory/saveMaterialInventory", flowData.value).then((res) => {

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -798,11 +798,11 @@
  })
  const maxQuantity =  Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
  let process = titleUploadData.value.thisProcess
  let laminating = titleUploadData.value.laminating
  equalByOrderNum.forEach((row) =>{
    if (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框'){
    if (laminating == 'laminating'){
      row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
    }

  })


@@ -1240,9 +1240,10 @@

const editClosedEvent = ({ row, column }) => {
  let process = titleUploadData.value.thisProcess
  let laminating = titleUploadData.value.laminating
  if (column.property==='completedQuantity') {
    xGrid.value.getTableData().fullData.forEach((item, index) =>{
      if(item.order_number===row.order_number && (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框')){
      if(item.order_number===row.order_number && laminating == 'laminating'){
        item.completedQuantity=row.completedQuantity
      }
    })

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue

@@ -192,7 +192,7 @@

//点击查询
const getWorkOrder = () => {

  gridOptions.loading = true
  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let inputVal = form.orderId
@@ -274,6 +274,7 @@
      total.dataTotal = res.data.total.total*1
      total.pageTotal=parseInt(res.data.total)
      pageNum.value=1
      total.value = res.data.footSum
      produceList = deepClone(res.data.data)
      // 使用map方法来处理每个对象
      let modifiedCollection = produceList.map(item => {

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java

@@ -1030,6 +1030,7 @@
            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setFunction("cancelMaterialAdditionRecord物料新增撤销");
            log.setContent(object.toString());
            //获取对象集合循环进行新增修改
            List<MaterialLog> materialLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("materialAdd")), MaterialLog.class);