suntg 7 anni fa
parent
commit
f6518510d9

+ 1 - 4
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -2206,9 +2206,6 @@ public class ProductServiceImpl implements ProductService {
                     if ((product.getMinPackQty() == null) || (ignoreImport == IntegerConstant.NO_SHORT)) {
                     if ((product.getMinPackQty() == null) || (ignoreImport == IntegerConstant.NO_SHORT)) {
                         product.setMinPackQty(productByBatch.getMinPackage());
                         product.setMinPackQty(productByBatch.getMinPackage());
                     }
                     }
-                    if ((product.getMinPackQty() == null) || (ignoreImport == IntegerConstant.NO_SHORT)) {
-                        product.setMinPackQty(productByBatch.getMinPackage());
-                    }
                     if ((product.getKind() == null)  || (ignoreImport == IntegerConstant.NO_SHORT)) {
                     if ((product.getKind() == null)  || (ignoreImport == IntegerConstant.NO_SHORT)) {
                         product.setKind(productByBatch.getKindName());
                         product.setKind(productByBatch.getKindName());
                         product.setKindid(productByBatch.getKindUuid());
                         product.setKindid(productByBatch.getKindUuid());
@@ -2216,7 +2213,7 @@ public class ProductServiceImpl implements ProductService {
                     if (StringUtils.isEmpty(product.getSpec()) || (ignoreImport == IntegerConstant.NO_SHORT)) {
                     if (StringUtils.isEmpty(product.getSpec()) || (ignoreImport == IntegerConstant.NO_SHORT)) {
                         product.setSpec(productByBatch.getSpec());
                         product.setSpec(productByBatch.getSpec());
                     }
                     }
-                    if ((ignoreImport == IntegerConstant.NO_SHORT) || (NumberUtil.compare(product.getErpReserve(), DoubleConstant.zero) != 0)) {
+                    if ((ignoreImport == IntegerConstant.NO_SHORT) || (NumberUtil.compare(product.getErpReserve(), DoubleConstant.zero) == 0)) {
                         Double qty = NumberUtil.sub(productByBatch.getReserve(), product.getErpReserve());
                         Double qty = NumberUtil.sub(productByBatch.getReserve(), product.getErpReserve());
                         if (NumberUtil.compare(qty, DoubleConstant.zero) != 0) {
                         if (NumberUtil.compare(qty, DoubleConstant.zero) != 0) {
                             //做出入库记录
                             //做出入库记录