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

chenlu

2024-07-19 a947e5ee99dd705832ef13554e0beb2e62d1e844

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

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

@@ -1202,6 +1202,10 @@
  }

}
const changeRowClass =  ({ row, rowIndex, $rowIndex }) => {
    return row?.rowClass

}

</script>

@@ -1371,8 +1375,9 @@
      <vxe-grid
          ref="xGrid"
          class="mytable-scrollbar"
          :row-class-name="changeRowClass"
          max-height="100%"
          height="400px"
          height="100%"
          size="small"
          v-bind="gridOptions"
          v-on="gridEvents"
@@ -1575,4 +1580,8 @@
  color: #fff;
}


::v-deep(.latter) {
  //display: none;
}
</style>

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

@@ -354,7 +354,9 @@
              title:titleUploadData.value,
              detail:$grid.getTableData().tableData,
              otherMoney:otherMoney.value,
              orderIdType:company.orderIdType
              orderIdType:company.orderIdType,
              creator:userStore.user.userName,
              creatorId:userStore.user.userId
            }
            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>item.width*item.height/1000000 < errorArea.value*1

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderGlassDetailMapper.java

@@ -24,4 +24,6 @@
    List<Map<String,Object>> getOrderGlassDetailByProductId(String orderId, String glassChild,Long productId);

    List<OrderGlassDetail> getOrderGlassDetailByProductIdGlassChild(String orderId, Integer orderNumber);

    Integer getMinIdByGroup(String orderId, String orderNumber, String group);
}

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

@@ -16,11 +16,13 @@
import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.pp.*;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
import com.example.erp.mapper.userInfo.LogMapper;
import com.example.erp.service.sd.OrderProcessDetailService;
import com.example.erp.service.userInfo.LogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -55,9 +57,10 @@
    LogService logService;

    final LogMapper logMapper;
    private final OrderGlassDetailMapper orderGlassDetailMapper;


    public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper,LogService logService,LogMapper logMapper) {
    public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper, LogService logService, LogMapper logMapper, OrderGlassDetailMapper orderGlassDetailMapper) {
        this.reportingWorkMapper = reportingWorkMapper;
        this.basicDateProduceMapper = basicDateProduceMapper;
        this.damageDetailsMapper = damageDetailsMapper;
@@ -68,6 +71,7 @@
        this.flowCardMapper = flowCardMapper;
        this.logService = logService;
        this.logMapper = logMapper;
        this.orderGlassDetailMapper = orderGlassDetailMapper;
    }

    public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process) {
@@ -131,7 +135,23 @@
            map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process));
        } else {
            //不是第一道工序，查询报工数据
            map.put("Detail", reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process));
            List<Map<String,String>>  details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process);
            if(process.equals("中空")){
                String orderId = processIdStr.substring(0,10);
                details.forEach( detail -> {
                    Integer glassId = orderGlassDetailMapper.
                                                getMinIdByGroup(orderId,
                                                    String.valueOf(detail.get("order_number")),
                                                    String.valueOf(detail.get("group")));
                    int listGlassId = Integer.parseInt(String.valueOf(detail.get("id")));
                    if(listGlassId  !=glassId){
                        detail.put("rowClass","latter");
                    }
                });
            }


            map.put("Detail",details );
        }

        // 第一道工序（流程卡数+补片数量-完工数-次破数-返工未完成数-禁用数量）

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

@@ -12,9 +12,11 @@
import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.dto.sd.OrderDetailProductDTO;
import com.example.erp.entity.sd.*;
import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.sd.*;
import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,9 +38,10 @@
    private final SysErrorService sysErrorService;
    private final OrderOtherMoneyMapper orderOtherMoneyMapper;
    private final ProductMapper productMapper;
    private final LogService logService;

    private final OrderProcessDetailMapper orderProcessDetailMapper;
    public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper, ProductMapper productMapper) {
    public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper, ProductMapper productMapper, LogService logService) {
        this.orderMapper = orderMapper;
        this.orderDetailMapper = orderDetailMapper;
        this.orderGlassDetailMapper = orderGlassDetailMapper;
@@ -46,6 +49,7 @@
        this.sysErrorService = sysErrorService;
        this.orderOtherMoneyMapper = orderOtherMoneyMapper;
        this.productMapper = productMapper;
        this.logService = logService;
    }

    public boolean saveOrder(Map<String,Object> orderMap) throws Exception {
@@ -63,11 +67,20 @@
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        //判断传入id参数是否为空，未传入id为空插入订单表，传入更新表
        try{
            Log log = new Log();
            log.setOperator(orderJson.getString("creator"));
            log.setOperatorId(orderJson.getString("creatorId"));
            log.setContent(orderMap.toString());

            if(order.getOrderId() == null || order.getOrderId().isEmpty()){
                insertOrder(order,OrderDetails,orderOtherMoneyList,orderIdType);
                log.setFunction("saveOrder创建:"+order.getOrderId());
            }else {
                updateOrder(order,OrderDetails,orderOtherMoneyList);
                log.setFunction("saveOrder修改:"+order.getOrderId());
            }

            logService.saveLog(log);
        }catch (Exception e){
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库

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

@@ -194,7 +194,8 @@
            odpd.broken_num as onceBroken,
            ogd.`group`,
            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
            od.other_columns
            od.other_columns,
            ogd.id

        FROM
            sd.order_detail AS od
@@ -210,6 +211,7 @@
                               limit 1)
        </if>


        LEFT JOIN flow_card AS fc
                ON fc.order_id = ogd.order_id
                and fc.production_id=ogd.production_id

 north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml

@@ -189,4 +189,12 @@
          and  ogd.glass_child=#{glassChild}
    </select>

    <select id="getMinIdByGroup" >
        select min(id) from sd.order_glass_detail as a
        where a.order_id = #{orderId}
          and a.order_number = #{orderNumber}
        and a.`group` = #{group}

    </select>

</mapper>