wms白坯原材料手持接口

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java

@@ -8,6 +8,9 @@ import com.op.common.core.utils.StringUtils;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.core.web.domain.AjaxResult;
 
+import com.op.common.log.annotation.Log;
+import com.op.common.log.enums.BusinessType;
+import com.op.common.security.annotation.RequiresPermissions;
 import com.op.wms.domain.*;
 import com.op.wms.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +46,10 @@ public class WmsToWCSmissionController {
     private IOdsProcureOutOrderService odsProcureOutOrderService;
     @Autowired
     private IWmsSellOutEmbryoService wmsSellOutEmbryoService;
+    @Autowired
+    private IBpProcureOrderService bpProcureOrderService;
+    @Autowired
+    private IBpRawMaterialInDetailService bpRawMaterialInDetailService;
     /**
      * 包材请求入库---
      *
@@ -906,5 +913,25 @@ public class WmsToWCSmissionController {
         return success(result);
     }
 
+    /**
+     * 获取白坯原材料采购单详细信息
+     */
+    @PostMapping( "/selectByprocureCode")
+    public AjaxResult selectByprocureCode(@RequestBody BpProcureOrder bpProcureOrder)
+    {
+        if (bpProcureOrderService.selectBpProcureOrderByProcureCodeSc(bpProcureOrder)==null){
+            return error("采购单不存在");
+        }
+        return success(bpProcureOrderService.selectBpProcureOrderByProcureCodeSc(bpProcureOrder));
+    }
+    /**
+     * 新增白坯原材料入库明细
+     */
+
+
+    @PostMapping("/addBpRawMaterialInDetail")
+    public AjaxResult add(@RequestBody BpRawMaterialInDetail bpRawMaterialInDetail){
+        return success(bpRawMaterialInDetailService.insertBpRawMaterialInDetailSC(bpRawMaterialInDetail));
+    }
 
 }

op-modules/op-wms/src/main/java/com/op/wms/domain/BpProcureOrder.java

@@ -71,6 +71,15 @@ public class BpProcureOrder extends BaseEntity
     /** 用户自定义5 */
     @Excel(name = "用户自定义5")
     private String attr5;
+    private String factoryCode;
+
+    public String getFactoryCode() {
+        return factoryCode;
+    }
+
+    public void setFactoryCode(String factoryCode) {
+        this.factoryCode = factoryCode;
+    }
 
     public void setID(String ID)
     {

op-modules/op-wms/src/main/java/com/op/wms/mapper/BpProcureOrderMapper.java

@@ -61,4 +61,6 @@ public interface BpProcureOrderMapper
 
 //    根据采购单号查询
     public BpProcureOrder selectBpProcureOrderByProcureCode(String procureCode);
+
+    public  BpProcureOrder selectBpProcureOrderByProcureCodeSc(BpProcureOrder bpProcureOrder);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IBpProcureOrderService.java

@@ -65,4 +65,6 @@ public interface IBpProcureOrderService
     * 根据采购单号查询接口
     * */
     BpProcureOrder selectBpProcureOrderByProcureCode(String procureCode);
+
+    BpProcureOrder selectBpProcureOrderByProcureCodeSc(BpProcureOrder bpProcureOrder);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IBpRawMaterialInDetailService.java

@@ -61,4 +61,6 @@ public interface IBpRawMaterialInDetailService
      * @return 结果
      */
     public int deleteBpRawMaterialInDetailById(String id);
+
+    int insertBpRawMaterialInDetailSC(BpRawMaterialInDetail bpRawMaterialInDetail);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpProcureOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.op.wms.service.impl;
 import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.wms.domain.BaseProduct;
 import com.op.wms.mapper.BaseProductMapper;
@@ -115,4 +116,12 @@ public class BpProcureOrderServiceImpl implements IBpProcureOrderService
     public BpProcureOrder selectBpProcureOrderByProcureCode(String procureCode){
         return bpProcureOrderMapper.selectBpProcureOrderByProcureCode(procureCode);
     }
+
+    @Override
+    public BpProcureOrder selectBpProcureOrderByProcureCodeSc(BpProcureOrder bpProcureOrder) {
+        String factoryCode = bpProcureOrder.getFactoryCode();
+        DynamicDataSourceContextHolder.push("ds_" + factoryCode);
+        return bpProcureOrderMapper.selectBpProcureOrderByProcureCodeSc(bpProcureOrder);
+    }
+
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.context.SecurityContextHolder;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.core.web.domain.AjaxResult;
@@ -187,4 +188,63 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
     public int deleteBpRawMaterialInDetailById(String id) {
         return bpRawMaterialInDetailMapper.deleteBpRawMaterialInDetailById(id);
     }
+
+    @Override
+    public int insertBpRawMaterialInDetailSC(BpRawMaterialInDetail bpRawMaterialInDetail) {
+        int  reselt=1;
+        //获取当前所选工厂
+        String factoryCode = bpRawMaterialInDetail.getFactoryCode();
+        DynamicDataSourceContextHolder.push("ds_" + factoryCode);
+        if (bpRawMaterialInDetail.getMaterialName().isEmpty() || bpRawMaterialInDetail.getAmountReal()==null){
+        }else {
+            bpRawMaterialInDetail.setId(IdUtils.fastSimpleUUID());
+            bpRawMaterialInDetail.setFactoryCode(factoryCode);
+            bpRawMaterialInDetail.setWaCode("白坯原料库");
+            BaseProduct baseProduct = baseProductMapper.selectBaseProductByProductName(bpRawMaterialInDetail.getMaterialName());
+            bpRawMaterialInDetail.setMaterialCode(baseProduct.getProductCode());
+            bpRawMaterialInDetail.setUnit("吨");
+            bpRawMaterialInDetail.setCreateBy(SecurityContextHolder.getUserName());
+            bpRawMaterialInDetail.setGmtCreate(new Date());
+            bpRawMaterialInDetail.setUserDefined1(bpRawMaterialInDetail.getUserDefined1());//采购单号
+            bpRawMaterialInDetailMapper.insertBpRawMaterialInDetail(bpRawMaterialInDetail);
+        }
+        //判断库存中物料是否存在
+        BpRawMaterialIn bpRawMaterialIn = bpRawMaterialInMapper.selectBpRawMaterialInBymateriaName(bpRawMaterialInDetail.getMaterialName());
+        if (bpRawMaterialIn==null){
+            //不存在，添加库存
+            BpRawMaterialIn bpRawMaterialIn1 = new BpRawMaterialIn();
+            bpRawMaterialIn1.setId(IdUtils.fastSimpleUUID());
+            bpRawMaterialIn1.setFactoryCode(factoryCode);
+            bpRawMaterialIn1.setWaCode("白坯原料库");
+            bpRawMaterialIn1.setMaterialName(bpRawMaterialInDetail.getMaterialName());
+            BaseProduct baseProduct = baseProductMapper.selectBaseProductByProductName(bpRawMaterialInDetail.getMaterialName());
+            bpRawMaterialIn1.setMaterialCode(baseProduct.getProductCode());
+            bpRawMaterialIn1.setUnit(bpRawMaterialInDetail.getUnit());
+            bpRawMaterialIn1.setAmountReal(bpRawMaterialInDetail.getAmountReal());
+            reselt=bpRawMaterialInMapper.insertBpRawMaterialIn(bpRawMaterialIn1);
+        }else {
+            //物料存在，加库存
+            bpRawMaterialIn.getAmountReal();//原有
+            bpRawMaterialInDetail.getAmountReal();//新增
+            bpRawMaterialIn.setAmountReal(bpRawMaterialIn.getAmountReal()+bpRawMaterialInDetail.getAmountReal());
+            bpRawMaterialInMapper.updateBpRawMaterialIn(bpRawMaterialIn);
+        }
+        //采购单减库存
+        // TODO: 2024-11-11  根据采购单号查询
+        BpProcureOrder bpProcureOrder = bpProcureOrderMapper.selectBpProcureOrderByProcureCode(bpRawMaterialInDetail.getUserDefined1());
+        if (bpProcureOrder==null){
+            reselt=2;
+            return reselt;
+        }else {
+            //采购单减数量
+//            BpProcureOrder bpProcureOrder1 = new BpProcureOrder();
+//            bpProcureOrder1.setProcureCode(bpRawMaterialInDetail.getUserDefined1());
+//            bpProcureOrder1.setMaterialName(bpRawMaterialInDetail.getMaterialName());
+//            BaseProduct baseProduct = baseProductMapper.selectBaseProductByProductName(bpRawMaterialInDetail.getMaterialName());
+//            bpProcureOrder1.setMaterialCode(baseProduct.getProductCode());
+            bpProcureOrder.setRealityNumber(bpRawMaterialInDetail.getAmountReal());
+            bpProcureOrderMapper.updateBpProcureOrder(bpProcureOrder);
+        }
+        return reselt;
+    }
 }

op-modules/op-wms/src/main/resources/mapper/wms/BpProcureOrderMapper.xml

@@ -69,7 +69,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             procure_code = #{procureCode}
     </select>
-
+    <select id="selectBpProcureOrderByProcureCodeSc" parameterType="BpProcureOrder" resultMap="BpProcureOrderResult">
+        SELECT
+            id,
+            material_code,
+            material_name,
+            supply_name,
+            plan_number,
+            procure_code,
+            reality_number,
+            unit,
+            price,
+            attr1,
+            attr2,
+            attr3,
+            attr4,
+            attr5
+        FROM
+            bp_procure_order
+        WHERE
+            procure_code = #{procureCode}
+    </select>
     <insert id="insertBpProcureOrder" parameterType="BpProcureOrder">
         insert into bp_procure_order
         <trim prefix="(" suffix=")" suffixOverrides=",">

op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml

@@ -413,7 +413,7 @@
         FROM
             wms_ods_mate_storage_news
         <where>
-        <if test="materialCode != null">material_code = #{materialCode},</if>
+        <if test="materialCode != null">material_code = #{materialCode}</if>
         </where>
     </select>
 </mapper>