提交更新

chenlu

2024-08-15 a841235e723f0ec06d5ac5628907d88c00d90131

提交更新

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

@@ -40,7 +40,7 @@
  like = null
}
data.value.printList = JSON.parse(props.printList)
let flowCardCount = data.value.printList.length
let flowCardCount = ''
onMounted(() => {
      request.post(`/processCard/getSelectPrinting/${merge}/${like}`, data.value).then((res) => {
        if (res.code == 200) {
@@ -203,13 +203,13 @@
            {{itemFlow.otherRemarks}}  
            流程卡号： {{
              itemFlow.process_id
            }}/{{ itemFlow.technologyNumberMerge }} 共 {{ flowCardCount }} 架
            }}/{{ itemFlow.technologyNumberMerge }} 共 {{ item.count }} 架
          </div>
          <div v-else style="text-align: right;font-weight: bolder">
            {{itemFlow.otherRemarks}}&nbsp;&nbsp;
            流程卡号： {{
              itemFlow.process_id
            }}/{{ itemFlow.technologyNumber }} 共 {{ flowCardCount }} 架
            }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
          </div>
        </td>
      </tr>

 north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue

@@ -142,10 +142,16 @@
  ],//表头按钮

  toolbarConfig: {
    buttons: [{
    buttons: [
        {
      'name': t('basicData.review'),status: 'primary',
      'code':'add'
    }],
        },
      // {
      //   'name': t('basicData.delete'),status: 'primary',
      //   'code':'delete'
      // }
    ],
    /*import: false,
    export: true,
    print: true,*/
@@ -204,6 +210,35 @@
          return

        }
        case 'delete': {
          const $table = xGrid.value
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()
            if (selectRecords.length === 0) {
              ElMessage.warning(t('productStock.unselectedData'))
              return
            }
            let flowData = ref({

              userId:userid,
              userName:username,
              patchLog:selectRecords

            })
            request.post("/Replenish/deleteReplenish",flowData.value).then((res) => {
              if(res.code==200 && res.data===true){
                ElMessage.success(t('basicData.msg.deleteSuccess'))
                router.push({path:'/main/Replenish/SelectReplenish',query:{random:Math.random()}})

              }else{
                ElMessage.warning(t('basicData.msg.deleteFail'))
                router.push("/login")
              }
            })
          }
          return

        }


      }

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue

@@ -48,12 +48,29 @@
})
const columns = [
  // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
  {field: 'product_name', width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
  {field: 'glass_child',width: 130, title:  t('reportingWorks.glassChild') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
  {field: 'order_type', width: 120,title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
  {field: 'process_id',width: 110, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
  {field: 'order_number', width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis"},
  {field: 'technology_number', width: 90,title: t('processCard.technologyNumber'),showOverflow:"ellipsis"},
  {field: 'product_name', width: 150,
    title: t('order.product'),
    filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  {field: 'glass_child',width: 130, title:  t('reportingWorks.glassChild') ,filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  {field: 'order_type', width: 120,title: t('order.orderType'),filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  {field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  {field: 'order_number', width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  {field: 'quantity', width: 90,title: t('order.quantity')},
  {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
  {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
@@ -192,7 +209,7 @@
            clearable
            :disabled="props.orderId"
            :placeholder="$t('order.orderId')"
            style="width: 130px"></el-input>
            style="width: 140px"></el-input>
        &nbsp;&nbsp;
        <el-button
            :disabled="props.orderId"
@@ -205,8 +222,7 @@

    </div>
    <vxe-grid
       height="520px"
        @filter-change="filterChanged"
       height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
@@ -229,7 +245,9 @@
      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
            <input v-model="option.data"
                   type="text"
                   @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>
@@ -246,7 +264,7 @@
<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
  height: 90%;
}
#selectForm {
  width: 60%;

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

@@ -77,4 +77,11 @@
        return Result.seccess(replenishService.getSelectPrintCustomLabelSv(type,lableType,object));

    }

//    @ApiOperation("补片删除接口")
//    @SaCheckPermission("SelectReplenish.review")
//    @PostMapping("/deleteReplenish")
//    public Result deleteReplenish( @RequestBody Map<String,Object> object){
//        return Result.seccess(replenishService.deleteReplenishSv(object));
//    }
}

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

@@ -163,4 +163,6 @@
    String selectUserMp(String userId);

    List<Map<String, Object>> selectSortTableMp(String orderId);

    String countFlowCard(String orderId);
}

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

@@ -324,10 +324,12 @@

                itemmap.put("processList", processList);
              //  itemmap.put("numberList", numberList);
                itemmap.put("count", flowCardMapper.countFlowCard(flowCard.getOrderId()));
                list.add(itemmap);

            }
        }

        map.put("data", list);
        //初始化值
        printLike=null;

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

@@ -216,5 +216,39 @@
        map.put("title", flowCardMapper.getPrintTitle(type));
        return map;
    }

    public Boolean deleteReplenishSv(Map<String, Object> object) {
        boolean saveState = true;
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
            String userName = "";
            String userId = "";
            if (object.get("userName") != null) {
                userName = object.get("userName").toString();
            }
            if (object.get("userId") != null) {
                userId = object.get("userId").toString();
            }
            //获取对象集合循环进行新增修改
            List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {

                }
            }

        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

        }

        return saveState;
    }
}


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

@@ -2034,4 +2034,8 @@
                 fcs.order_number,
                 fcs.technology_number
    </select>

    <select id="countFlowCard">
        select count(distinct process_id) from flow_card where order_id = #{orderId}
    </select>
</mapper>

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

@@ -165,7 +165,8 @@
               e.broken_num,
               ifnull(f.inventory, 0)                         as inventory,
               round(ifnull(f.inventory, 0) * a.area, 2)      as inventoryArea,
               ifnull(dd.quantity, 0)                         as shippedQuantity
               ifnull(dd.quantity, 0)                         as shippedQuantity,
               JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')) AS glassNumber
        from flow_card as c
                 left join
             sd.order_detail as a