aps-坯料计划保存校验取消单位转换，目前全部为 吨

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -1640,23 +1640,26 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     BigDecimal outputWeight = new BigDecimal(0);
                     //坯料的单卷重
                     BigDecimal blankWeight = new BigDecimal(0);
-                    //统一输出的重量
-                    //公斤/千克
-                    if (apsProcessOutputProductDo.getCountunit().equals(SaveConstans.CountUnit.KG)) {
-                        outputWeight = apsProcessOutputProductDo.getOutputonerollweigth();
-                    }
-                    //吨
-                    if (apsProcessOutputProductDo.getCountunit().equals(SaveConstans.CountUnit.TON)) {
-                        outputWeight = apsProcessOutputProductDo.getOutputonerollweigth().multiply(new BigDecimal(1000));
-                    }
-
-                    //统一坯料的重量
-                    if (apsBlankOrderDo.getNumberunit().equals(SaveConstans.CountUnit.KG)) {
-                        blankWeight = apsBlankOrderDo.getSinglerollweight();
-                    }
-                    if (apsBlankOrderDo.getNumberunit().equals(SaveConstans.CountUnit.TON)) {
-                        blankWeight = apsBlankOrderDo.getSinglerollweight().multiply(new BigDecimal(1000));
-                    }
+                    outputWeight = apsProcessOutputProductDo.getOutputonerollweigth();
+                    blankWeight = apsBlankOrderDo.getSinglerollweight();
+                    //统一输出的重量 现在都是吨（固定的）
+//                    //公斤/千克
+//                    if (apsProcessOutputProductDo.getCountunit().equals(SaveConstans.CountUnit.KG)) {
+//                        outputWeight = apsProcessOutputProductDo.getOutputonerollweigth();
+//                    }
+//                    //吨
+//                    if (apsProcessOutputProductDo.getCountunit().equals(SaveConstans.CountUnit.TON)) {
+//                        outputWeight = apsProcessOutputProductDo.getOutputonerollweigth().multiply(new BigDecimal(1000));
+//                    }
+//
+//                    //统一坯料的重量
+//                    if (apsBlankOrderDo.getNumberunit().equals(SaveConstans.CountUnit.KG)) {
+//                        blankWeight = apsBlankOrderDo.getSinglerollweight();
+//                    }
+//                    if (apsBlankOrderDo.getNumberunit().equals(SaveConstans.CountUnit.TON)) {
+//                        BigDecimal singlerollweight = apsBlankOrderDo.getSinglerollweight();
+//                        blankWeight = singlerollweight.multiply(new BigDecimal(1000));
+//                    }
                     //校验 输出单卷重 必须小于等于坯料单卷重，必须大于等于单卷重（起），必须小于等于单卷重（止）
                     //输出单卷重>坯料单卷重
                     if (outputWeight.compareTo(blankWeight) > 0) {