删除领用明细

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

@@ -121,7 +121,7 @@
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM t_wh_material_requisition_info
-		WHERE material_requisition_id = #{materialRequisition.id}
+		WHERE id = #{id}
 	</update>
 	
 	<!--逻辑删除-->

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

@@ -51,7 +51,7 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
 	@Autowired
 	private QrCodeService qrCodeService;
 
-	
+
 	public MaterialRequisition get(String id) {
 		MaterialRequisition materialRequisition = super.get(id);
 		materialRequisition.setMaterialRequisitionInfoList(materialRequisitionInfoMapper.findList(new MaterialRequisitionInfo(materialRequisition)));
@@ -70,12 +70,22 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
 	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);
-			materialRequisitionInfo.preInsert();
-			materialRequisitionInfoMapper.insert(materialRequisitionInfo);
+			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);
+			}
 		}
 	}
 	

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

@@ -20,12 +20,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.google.common.collect.Lists;