物资领用新增字段领用状态（1未出库，2已出库）

物资领用保存接口逻辑修改

src/main/java/com/jeeplus/modules/warehouse/materialrequisition/entity/MaterialRequisition.java

@@ -22,6 +22,7 @@ public class MaterialRequisition extends DataEntity<MaterialRequisition> {
 	
 	private static final long serialVersionUID = 1L;
 	private String number;		// 领用单号
+	private String status;		// 出库状态 1未出库 2已出库
 	private User operator;		// 操作人
 //	private String receiver;		// 领用人
 	private Office office;		// 领用机构
@@ -72,6 +73,14 @@ public class MaterialRequisition extends DataEntity<MaterialRequisition> {
 		return time;
 	}
 
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
 	public void setTime(Date time) {
 		this.time = time;
 	}

src/main/java/com/jeeplus/modules/warehouse/materialrequisition/mapper/xml/MaterialRequisitionMapper.xml

@@ -5,6 +5,7 @@
 	<sql id="materialRequisitionColumns">
 		a.id AS "id",
 		a.number AS "number",
+		a.status AS "status",
 		a.operator AS "operator.id",
 		a.collecting_office_id AS "office.id",
 		a.time AS "time",
@@ -87,6 +88,7 @@
 		INSERT INTO t_wh_material_requisition(
 			id,
 			number,
+			status,
 			operator,
 			collecting_office_id,
 			time,
@@ -99,6 +101,7 @@
 		) VALUES (
 			#{id},
 			#{number},
+			#{status},
 			#{operator.id},
 			#{office.id},
 			#{time},
@@ -114,6 +117,7 @@
 	<update id="update">
 		UPDATE t_wh_material_requisition SET 	
 			number = #{number},
+			status = #{status},
 			operator = #{operator.id},
 			collecting_office_id = #{office.id},
 			time = #{time},

src/main/java/com/jeeplus/modules/warehouse/materialrequisition/service/MaterialRequisitionService.java

@@ -68,23 +68,14 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
 	
 	@Transactional(readOnly = false)
 	public void save(MaterialRequisition materialRequisition) {
+		materialRequisition.setStatus("1");
 		super.save(materialRequisition);
+		materialRequisitionInfoMapper.delete(new MaterialRequisitionInfo(materialRequisition));
 		for (MaterialRequisitionInfo materialRequisitionInfo : materialRequisition.getMaterialRequisitionInfoList()){
+			materialRequisitionInfo.setId(null);
 			materialRequisitionInfo.setMaterialRequisition(materialRequisition);
-			if (materialRequisitionInfo.getId() == null){
-				continue;
-			}
-			if (MaterialRequisitionInfo.DEL_FLAG_NORMAL.equals(materialRequisitionInfo.getDelFlag())){
-				if (StringUtils.isBlank(materialRequisitionInfo.getId())){
-					materialRequisitionInfo.preInsert();
-					materialRequisitionInfoMapper.insert(materialRequisitionInfo);
-				}else{
-					materialRequisitionInfo.preUpdate();
-					materialRequisitionInfoMapper.update(materialRequisitionInfo);
-				}
-			}else{
-				materialRequisitionInfoMapper.delete(materialRequisitionInfo);
-			}
+			materialRequisitionInfo.preInsert();
+			materialRequisitionInfoMapper.insert(materialRequisitionInfo);
 		}
 	}
 	
@@ -104,6 +95,7 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
 		if(materialRequisition.getNumber() == null &&Objects.equals(materialRequisition.getNumber(), "")){
 			materialRequisition.setNumber(this.createLYDH());
 		}
+		materialRequisition.setStatus("2");
 		this.save(materialRequisition);
 		Outbound outbound = new Outbound();
 		//设置相关表单id为领用主表的ID

src/main/java/com/jeeplus/modules/warehouse/materialrequisition/web/MaterialRequisitionController.java

@@ -123,8 +123,14 @@ public class MaterialRequisitionController extends BaseController {
 			return j;
 		}
 		//新增或编辑表单保存
-//		materialRequisitionService.save(materialRequisition);//保存
-		materialRequisitionService.delivery(materialRequisition);
+		if(!Objects.equals(materialRequisition.getStatus(), "2")){
+			materialRequisitionService.save(materialRequisition);//保存
+		}else {
+			j.setSuccess(false);
+			j.setMsg("该物资领用单已出库不可以修改");
+			return j;
+		}
+//		materialRequisitionService.delivery(materialRequisition);
 
 		j.setSuccess(true);
 		j.setMsg("保存物资领用成功");
@@ -263,6 +269,11 @@ public class MaterialRequisitionController extends BaseController {
 		}
 		//新增或编辑表单保存
 //		materialRequisitionService.save(materialRequisition);//保存
+		if(Objects.equals(materialRequisition.getStatus(), "2")){
+			j.setSuccess(false);
+			j.setMsg("该物资已领用出库，不可重复领用");
+			return j;
+		}
 		materialRequisitionService.delivery(materialRequisition);
 		j.setSuccess(true);
 		j.setMsg("保存物资领用成功");