规格修改

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java

@@ -332,6 +332,13 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
                 businessOrderQueryWrapper.eq("d.name",value);
             }
 
+            if(ObjectUtil.isNotEmpty(businessOrderPagination.getContractNo())){
+                businessOrderNum++;
+
+                String value = String.valueOf(businessOrderPagination.getContractNo());
+                businessOrderQueryWrapper.eq("d.contract_no",value);
+            }
+
 
             if(ObjectUtil.isNotEmpty(businessOrderPagination.getDeliveryType())){
                 businessOrderNum++;
@@ -703,6 +710,13 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
 
             }
 
+
+            if(ObjectUtil.isNotEmpty(businessOrderPagination.getContractNo())){
+                businessOrderNum++;
+                String value = String.valueOf(businessOrderPagination.getContractNo());
+                businessOrderQueryWrapper.like("d.contract_no",value);
+            }
+
             if(ObjectUtil.isNotEmpty(businessOrderPagination.getBusinessNum())){
                 businessOrderNum++;
                 String value = String.valueOf(businessOrderPagination.getBusinessNum());

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java

@@ -824,7 +824,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                     inventoryEntity.setPhoto(productWarehouseEntity.getPhoto());
                     inventoryEntity.setBrandId(productWarehouseEntity.getBrandId());
                     inventoryEntity.setProductTypeId(productWarehouseEntity.getProductTypeId());
-                    inventoryEntity.setSpec(productWarehouseEntity.getSpec());
+                    inventoryEntity.setSpec(entitys.getSpec());
                     inventoryEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId());
                     inventoryEntity.setWarehouseId(entity.getWarehouseId());
                     inventoryEntity.setStorageAreaId(entitys.getCargoId());