修改入库

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -41,6 +41,7 @@ public enum YExceptionEnum {
 	WEIGHT_NOT_DELETED_ERROR("ERROR", "请先删除对应的检斤信息！"),
 	QUALITY_NO_ERROR("ERROR", "业务编号已存在，不可重复！"),
 	TARE_NULL("ERROR", "皮重不能为空！"),
+	GROSSWEIGHT_NULL("ERROR", "毛重不能为空！"),
 	;
 	@Getter
 	private String value;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -198,7 +198,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
 //                paymentManagementService.insert(paymentManagement1);
 //            }
 //        }
-//
+        if( weighingManagement.getGrossWeight() == null || weighingManagement.getGrossWeight() == 0){
+            throw new YException(YExceptionEnum.GROSSWEIGHT_NULL);
+        }
         boolean one = this.updateById(weighingManagement);
         if (one) {
             return weighingManagement.getId();

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -219,7 +219,9 @@
         left join common_company c on c.comp_id = b.comp_id and c.delete_flag = 0
         left join in_out_warehouse_task i on w.contract_no = i.move_task_no and i.delete_flag = 0 and i.in_out_type =
         '移库出库'
-        and i.receive_warehouse = #{warehouseName}
+        <if test="warehouseName != null and warehouseName != ''">
+            AND i.receive_warehouse = #{warehouseName}
+        </if>
         left join tran_car_info t on t.contract_no = w.contract_no and t.delete_flag = 0 and t.tran_car_no =
         w.tran_car_no and t.car_no = w.car_no
         left join tran_settlement_report r on r.car_id = t.id and r.delete_flag = 0