修改添加物料时使用物料类别生成物料编码

mahuandong
1 parent 43484756
Showing 4 changed files with 74 additions and 31 deletions
src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
src/main/java/com/huaheng/pc/config/material/service/MaterialService.java
src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
@@ -108,35 +108,7 @@ public class MaterialController extends BaseController {
     @ResponseBody
     public AjaxResult addSave(Material material) {
  
-        LambdaQueryWrapper<Material> lambda = Wrappers.lambdaQuery();
-        lambda.eq(Material::getCode, material.getCode())
-            .eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode())
-            .eq(Material::getDeleted, false);
-        Map<String, Object> map = materialService.getMap(lambda);
-        if (map != null) {
-            return AjaxResult.error("物料已经存在");
-        }
-        LambdaQueryWrapper<MaterialUnit> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(MaterialUnit::getMaterialCode, material.getCode())
-                .eq(MaterialUnit::getUnit, material.getUnit());
-        if (materialUnitService.getOne(lambdaQueryWrapper) == null){
-            MaterialUnit materialUnit = new MaterialUnit();
-            materialUnit.setMaterialCode(material.getCode());
-            materialUnit.setMaterialName(material.getName());
-            materialUnit.setMaterialSpec(material.getSpec());
-            materialUnit.setCompanyCode(material.getCompanyCode());
-            materialUnit.setWarehouseCode(ShiroUtils.getWarehouseCode());
-            materialUnit.setUnit(material.getUnit());
-            materialUnit.setCreatedBy(ShiroUtils.getLoginName());
-            materialUnit.setLastUpdatedBy(ShiroUtils.getLoginName());
-
-            materialUnitService.save(materialUnit);
-        }
-
-        material.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        material.setCreatedBy(ShiroUtils.getLoginName());
-        material.setLastUpdatedBy(ShiroUtils.getLoginName());
-        return AjaxResult.toAjax(materialService.save(material));
+        return materialService.addSave(material);
     }
  
     /**
@@ -13,5 +13,10 @@ public interface MaterialService extends IService&lt;Material&gt;{
  
     String importMaterial(List<Material> materialList, Boolean updateSupport,String operName);
  
-
+    /**
+     * 添加物料
+     * @param material
+     * @return
+     */
+    AjaxResult addSave(Material material);
 }
@@ -7,10 +7,15 @@ import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.materialType.domain.MaterialType;
+import com.huaheng.pc.config.materialType.service.MaterialTypeService;
+import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
+import com.huaheng.pc.config.materialUnit.service.MaterialUnitService;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Map;
  
@@ -23,6 +28,10 @@ public class MaterialServiceImpl extends ServiceImpl&lt;MaterialMapper, Material&gt; i
  
     @Resource
     private ReceiptDetailService receiptDetailService;
+    @Resource
+    private MaterialUnitService materialUnitService;
+    @Resource
+    private MaterialTypeService materialTypeService;
  
     @Override
     public AjaxResult removeByIds(String ids) {
@@ -94,4 +103,60 @@ public class MaterialServiceImpl extends ServiceImpl&lt;MaterialMapper, Material&gt; i
         }
         return successMsg.toString();
     }
+
+    /**
+     * 添加物料
+     * @param material
+     * @return
+     */
+    @Override
+    public AjaxResult addSave(Material material) {
+        LambdaQueryWrapper<Material> lambda = Wrappers.lambdaQuery();
+        //如果物料编码为空则生成物料编码
+        if (material.getCode() == null) {
+            material.setCode(createCode(material.getType()));
+        }
+        lambda.eq(Material::getCode, material.getCode())
+                .eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(Material::getDeleted, false);
+        Map<String, Object> map = this.getMap(lambda);
+        if (map != null) {
+            return AjaxResult.error("物料已经存在");
+        }
+
+        LambdaQueryWrapper<MaterialUnit> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(MaterialUnit::getMaterialCode, material.getCode())
+                .eq(MaterialUnit::getUnit, material.getUnit());
+        //如果不存在该物料的单位是新建物料单位
+        if (materialUnitService.getOne(lambdaQueryWrapper) == null){
+            MaterialUnit materialUnit = new MaterialUnit();
+            materialUnit.setMaterialCode(material.getCode());
+            materialUnit.setMaterialName(material.getName());
+            materialUnit.setMaterialSpec(material.getSpec());
+            materialUnit.setCompanyCode(material.getCompanyCode());
+            materialUnit.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            materialUnit.setUnit(material.getUnit());
+            materialUnit.setCreatedBy(ShiroUtils.getLoginName());
+            materialUnit.setLastUpdatedBy(ShiroUtils.getLoginName());
+
+            materialUnitService.save(materialUnit);
+        }
+        material.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        material.setCreatedBy(ShiroUtils.getLoginName());
+        material.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return null;
+    }
+
+    /**
+     * 生成物料编码
+     * @param code
+     * @return
+     */
+    private String createCode(String code){
+        LambdaQueryWrapper<MaterialType> lambda = Wrappers.lambdaQuery();
+        lambda.eq(MaterialType::getCode, code);
+        MaterialType materialType = materialTypeService.getOne(lambda);
+
+        return String.format(materialType.getAutoGenSerialNumFormat(), materialType.getTrackSerialNum());
+    }
 }
@@ -154,8 +154,9 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
      * @param receiptDetail
      * @return
      */
+    @Transactional
     public ReceiptDetail queryflow(ReceiptDetail receiptDetail){
-
+        //当单据状态为驳回或作废时不更新状态
         if ("10".equals(receiptDetail.getProcessStamp()) || "20".equals(receiptDetail.getProcessStamp())){
             return receiptDetail;
         }