Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

yuan

5 天以前 84b131de4a1deb526066fc0f7e7514ac43838bf8

 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java

@@ -254,6 +254,9 @@
            }
            productOrderMapper.updateById(productOrder);
            /*添加生产核算        区分工序是计件还是计时*/
            if (productProcess.getSalaryQuota() == null){
                throw new IllegalArgumentException("请设置对应工序工资定额");
            }
            BigDecimal workHours = (productProcess.getType() == 1)
                    ? productProcess.getSalaryQuota().multiply(productQty)
                    : productProcess.getSalaryQuota();