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

chenlu

2025-12-01 9dd76aba722a095d350eda2060fe40740e6ce661

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

 north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue

@@ -2,7 +2,8 @@

  <div style="width: 100%">
    <template v-for="(itme, index) in dataCollection" :key="index">
      <div style="width: 90%;height: 120px;margin: auto;;background-color: aliceblue;">
      <el-card style="width: 95%;height: 120px;margin: auto">

      <div style="width: 200px;font-size: 18px;text-align: left;">{{itme.process_name}}</div>
      <div style="display: flex;margin-top: 10px">
        <template v-for="(itme1, index) in itme.detail" :key="index">
@@ -33,7 +34,7 @@
          </div>
        </template>
      </div>
      </div>
      </el-card>
      <br>
    </template>


 north-glass-erp/northglass-erp/src/hook/mouseMove.ts

@@ -15,7 +15,7 @@
let cellarea = ref(`
    <div class="vxe-table--cell-area" style="font-size: 10px;text-align: left" >
      <span class="vxe-table--cell-main-area" >
        <p style="bottom: 0;color: blue;background-color: #5cadfe; margin-top: auto;"></p>
        <p style="bottom: 0;color: blue;background-color: #5cadfe; margin-top: auto;font-size: 14px"></p>
        </span>
      <span class="vxe-table--cell-active-area"  ></span>
    </div>

 north-glass-erp/northglass-erp/src/hook/mouseMoveHomePage.ts

@@ -15,7 +15,7 @@
let cellarea = ref(`
    <div class="vxe-table--cell-area" style="font-size: 10px;text-align: left" >
      <span class="vxe-table--cell-main-area" >
        <p style="bottom: 0;color: blue;background-color: #5cadfe; margin-top: auto;"></p>
        <p style="bottom: 0;color: blue;background-color: #5cadfe; margin-top: auto;font-size: 14px"></p>
        </span>
      <span class="vxe-table--cell-active-area"  ></span>
    </div>

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

@@ -139,7 +139,7 @@
          { code: 'updateOrderId', name: t('searchOrder.updateOrderId'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'reportingTransfer', name: t('searchOrder.reportingTransfer'), prefixIcon: 'vxe-icon-send', visible: true, disabled: true },
          { code: 'uploadPicture', name: t('order.graphic'),prefixIcon: 'vxe-icon-picture-fill',  visible: true, },
          { code: 'fileUpload', name: t('上传dwg文件'),prefixIcon: 'vxe-icon-picture-fill',  visible: true, }
          { code: 'fileUpload', name: t('上传DWG文件'),prefixIcon: 'vxe-icon-picture-fill',  visible: true, }
        ]
      ]
    }

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

@@ -9,6 +9,7 @@
import com.example.erp.service.mm.FinishedGoodsInventoryService;
import com.example.erp.service.mm.MaterialInventoryService;
import com.example.erp.service.pp.ReportService;
import com.example.erp.service.pp.ReportingWorkService;
import com.example.erp.service.sd.DeliveryService;
import com.example.erp.service.sd.OrderService;
import io.swagger.annotations.Api;
@@ -30,6 +31,7 @@
    private final MaterialInventoryService materialInventoryService;
    private final FinishedGoodsInventoryService finishedGoodsInventoryService;
    private final ReportService reportService;
    private final ReportingWorkService reportingWorkService;

    @ApiOperation("订单报表")
    @PostMapping("/getOrderList")
@@ -87,4 +89,11 @@
    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
        return Result.success(finishedGoodsInventoryService.addDeliveryDetail(object));
    }

    @ApiOperation("app多个流程卡报工")
    @PostMapping("/addWorkInProgress")
    @SaCheckPermission("addReportingWork.add")
    public Result addWorkInProgress(@RequestBody Map<String,Object> object){
        return reportingWorkService.addWorkInProgress(object);
    }
}

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

@@ -1796,4 +1796,37 @@

        return result;
    }

    @Transactional(rollbackFor = Exception.class)
    public Result addWorkInProgress(Map<String, Object> object) {
        List<Map<String,Object>> list = (List<Map<String,Object>>) object.get("reportingWorks");

        list.forEach(item -> {
            ReportingWork reportingWork = JSONObject.parseObject(
                    JSONObject.toJSONString(item.get("processTitle")), ReportingWork.class);
            Map<String, String> mapTitle = new HashMap<>();
            String[] processIdStr = reportingWork.getProcessId() != null
                    ? reportingWork.getProcessId().split("/")
                    : new String[]{""};
            mapTitle.put("process", reportingWork.getPreviousProcess());
            mapTitle.put("processId", reportingWork.getProcessId());
            mapTitle.put("thisProcess", reportingWork.getThisProcess());
            mapTitle.put("technologyStr", processIdStr[1]);
            mapTitle.put("userName", object.get("userName").toString());
            ReviewReportingWorkSv(mapTitle);


            Map<String, Object> map = new HashMap<>();
            map.put("detail", item.get("processList"));
            map.put("title", item.get("processTitle"));
            map.put("type", object.get("type"));
            map.put("userId", object.get("userId"));
            map.put("userName", object.get("userName"));
            map.put("qualityInsStatus", object.get("qualityInsStatus"));
            map.put("class", object.get("class"));
            SaveReportingWorkSv(map);
        });

        return Result.success(true);
    }
}

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

@@ -37,6 +37,7 @@
        <association property="flowCard" javaType="com.example.erp.entity.pp.FlowCard">
            <result property="orderId" column="order_id"/>
            <result property="productionId" column="production_id"/>
            <result property="processId" column="processIdFirst"/>
        </association>
        <association property="reportingWorkDetail" javaType="com.example.erp.entity.pp.ReportingWorkDetail">
            <result property="completedQuantity" column="completed_quantity"/>
@@ -69,6 +70,7 @@
    <select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">
        select o.order_id,
               fc.production_id,
               fc.process_id as 'processIdFirst',
               o.customer_id,
               o.customer_name,
               o.project,