|
@@ -2116,23 +2116,25 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
BigDecimal outputWeight = new BigDecimal(0);
|
|
|
//坯料的单卷重
|
|
|
BigDecimal blankWeight = new BigDecimal(0);
|
|
|
+ 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)) {
|
|
|
- blankWeight = apsBlankOrderDo.getSinglerollweight().multiply(new BigDecimal(1000));
|
|
|
- }
|
|
|
+// //公斤/千克
|
|
|
+// 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));
|
|
|
+// }
|
|
|
//输出单卷重>坯料单卷重
|
|
|
if (outputWeight.compareTo(blankWeight) > 0) {
|
|
|
return R.error("第" + j + "个坯料计划 输出成品:" + apsProcessOutputProductDo.getProductname() + " 输出单卷重不能超过坯料单卷重");
|