获取数据修改

aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java

@@ -96,7 +96,7 @@ public class SAPPutStorageServiceImpl implements ISAPPutStorageService {
                 baseOrderInfo.setMaterialCode(map.get("MATNR"));
                 baseOrderInfo.setMaterialName(map.get("MAKTX"));
                 if (!map.get("GAMNG").equals(null)) {
-                    baseOrderInfo.setOrderAmount(Long.valueOf(map.get("GAMNG")));
+                    baseOrderInfo.setOrderAmount(new BigDecimal(map.get("GAMNG")));
                 }
                 baseOrderInfo.setFactoryCode(map.get("WERKS"));
                 baseOrderInfo.setOrderType(map.get("AUART"));
@@ -129,7 +129,7 @@ public class SAPPutStorageServiceImpl implements ISAPPutStorageService {
             device.setDeviceCode(map.get("EQUNR"));
             List<BaseDeviceLedger> baseDeviceLedgers = baseDeviceLedgerService.selectBaseDeviceLedgerList(device);
 
-            if (!baseDeviceLedgers.isEmpty()) {
+            if (baseDeviceLedgers.isEmpty()) {
                 BaseDeviceLedger deviceLedger = new BaseDeviceLedger();
                 deviceLedger.setCostCenter(map.get("KOSTL"));//
                 deviceLedger.setFactoryCode(map.get("IWERK"));

aucma-base/src/main/java/com/aucma/base/domain/BaseOrderInfo.java

@@ -1,5 +1,6 @@
 package com.aucma.base.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -62,7 +63,7 @@ public class BaseOrderInfo extends BaseEntity {
      * 订单计划数量
      */
     @Excel(name = "订单计划数量")
-    private Long orderAmount;
+    private BigDecimal orderAmount;
 
     /**
      * 完成数量
@@ -211,12 +212,12 @@ public class BaseOrderInfo extends BaseEntity {
         return matkl;
     }
 
-    public void setOrderAmount(Long orderAmount) {
+    public BigDecimal getOrderAmount() {
-        this.orderAmount = orderAmount;
+        return orderAmount;
     }
 
-    public Long getOrderAmount() {
+    public void setOrderAmount(BigDecimal orderAmount) {
-        return orderAmount;
+        this.orderAmount = orderAmount;
     }
 
     public void setCompleteAmount(Long completeAmount) {

aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.aucma.production.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.aucma.base.domain.BaseOrderInfo;
@@ -125,8 +126,8 @@ public class ProductPlanInfoServiceImpl implements IProductPlanInfoService
             String orderCode = baseOrderInfo.getOrderCode();
             String saleOrderCode = baseOrderInfo.getSaleOrderCode();
             String saleOrderLineNumber = baseOrderInfo.getSaleOrderLineNumber();
-            Long orderAmount = baseOrderInfo.getOrderAmount();
+            BigDecimal orderAmount = baseOrderInfo.getOrderAmount();
-            if (StringUtils.isNull(orderAmount) || orderAmount < 1L){
+            if (StringUtils.isNull(orderAmount) || (orderAmount.compareTo(new BigDecimal(1))==-1)){
                 throw new BaseException("该工单计划数量不合法！");
             }
             //获取生产BOM信息
@@ -147,7 +148,7 @@ public class ProductPlanInfoServiceImpl implements IProductPlanInfoService
                 planInfo.setMaterialCode(baseBomInfo.getMaterialCode());
                 planInfo.setMaterialName(baseBomInfo.getMaterialName());
                 planInfo.setProductLineCode(baseBomInfo.getProductLineCode());
-                planInfo.setPlanAmount(baseBomInfo.getStandardAmount() * orderAmount);
+                planInfo.setPlanAmount(baseBomInfo.getStandardAmount() * orderAmount.longValue());
                 this.insertProductPlanInfo(planInfo);
             }
             baseOrderInfo.setIsRelease(0L);