制造单程序修改

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/MakeMaterial.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.storage.po;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import com.usoftchina.saas.document.dto.ProductDTO;
 import com.usoftchina.saas.document.entities.Product;
 
 import java.io.Serializable;
@@ -24,6 +25,8 @@ public class MakeMaterial extends CommonBaseEntity implements Serializable {
 
     private String mm_whcode;
 
+    private String mm_whname;
+
     private Double mm_price;
 
     private Double mm_oneuseqty;
@@ -36,14 +39,22 @@ public class MakeMaterial extends CommonBaseEntity implements Serializable {
 
     private String mm_remark;
 
-    private Product product;
+    private ProductDTO productDTO;
+
+    public String getMm_whname() {
+        return mm_whname;
+    }
+
+    public void setMm_whname(String mm_whname) {
+        this.mm_whname = mm_whname;
+    }
 
-    public Product getProduct() {
-        return product;
+    public ProductDTO getProductDTO() {
+        return productDTO;
     }
 
-    public void setProduct(Product product) {
-        this.product = product;
+    public void setProductDTO(ProductDTO productDTO) {
+        this.productDTO = productDTO;
     }
 
     public Long getMm_maid() {

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/MakeServiceImpl.java

@@ -89,7 +89,6 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
                     makeMaterial.setCompanyId(BaseContextHolder.getCompanyId());
                     makeMaterial.setCreatorId(BaseContextHolder.getUserId());
                     makeMaterial.setCreateTime(new Date());
-
                 }
                 makeMaterialMapper.batchInsert(makeMaterialList);
             }
@@ -109,6 +108,7 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
                 //更新从表
                 for (MakeMaterial makeMaterial : makeMaterialList) {
                     if (makeMaterial.getId() == 0) {
+                        makeMaterial.setMm_maid(make.getId());
                         makeMaterial.setCreatorId(BaseContextHolder.getUserId());
                         makeMaterial.setCreateTime(new Date());
                         makeMaterial.setCompanyId(BaseContextHolder.getCompanyId());
@@ -121,8 +121,12 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
                     }
                 }
                 //执行插入、更新
-                makeMaterialMapper.batchInsert(insertItems);
-                makeMaterialMapper.batchUpdate(updateItems);
+                if (insertItems.size() > 0) {
+                    makeMaterialMapper.batchInsert(insertItems);
+                }
+                if (updateItems.size() > 0) {
+                    makeMaterialMapper.batchUpdate(updateItems);
+                }
             }
             //记录LOG
             docBaseDTO = generateMsgObj(make.getId(), make.getMa_code());

applications/storage/storage-server/src/main/resources/mapper/MakematerialMapper.xml

@@ -18,7 +18,7 @@
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
-    <association property="product" javaType="com.usoftchina.saas.document.dto.ProductDTO">
+    <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
         <id column="pr_id" property="id" jdbcType="INTEGER" />
         <result column="pr_code" property="pr_code" jdbcType="VARCHAR" />
         <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR" />
@@ -246,18 +246,18 @@
     where mm_id = #{id}
   </update>
   <select id="selectByFK" resultMap="BaseResultMap">
-    SELECT * FROM MAKEMATERIAL LEFT JOIN PRODUCT ON PR_ID=MA_PRODID AND MAKEMATERIAL.COMPANYID=PRODUCT.COMPANYID WHERE MM_MAID=#{id} AND MAKEMATERIAL.COMPANYID={companyId}
+    SELECT * FROM MAKEMATERIAL LEFT JOIN PRODUCT ON PR_ID=MM_PRODID AND MAKEMATERIAL.COMPANYID=PRODUCT.COMPANYID WHERE MM_MAID=#{id} AND MAKEMATERIAL.COMPANYID=#{companyId}
   </select>
   <delete id="deleteByFK">
-    DELETE FROM MAKEMATERIAL WHERE MM_MAID=#{id} AND COMPANYID={companyId}
+    DELETE FROM MAKEMATERIAL WHERE MM_MAID=#{id} AND COMPANYID=#{companyId}
   </delete>
   <insert id="batchInsert" parameterType="java.util.List">
       INSERT INTO MAKEMATERIAL (mm_maid, mm_detno,
       mm_prodid, mm_prodcode, mm_whid,
-      mm_whcode, mm_price, mm_oneuseqty,
+      mm_whcode, mm_price, mm_oneuseqty
       mm_qty, mm_amount, mm_repprodcode,
       mm_remark, companyId, updaterId,
-      updateTime)
+      updateTime,mm_whname)
       VALUES
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
       (
@@ -266,7 +266,7 @@
       #{item.mm_whcode,jdbcType=VARCHAR}, #{item.mm_price,jdbcType=DOUBLE}, #{item.mm_oneuseqty,jdbcType=DOUBLE},
       #{item.mm_qty,jdbcType=DOUBLE}, #{item.mm_amount,jdbcType=DOUBLE}, #{item.mm_repprodcode,jdbcType=VARCHAR},
       #{item.mm_remark,jdbcType=VARCHAR}, #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER},
-      #{item.updateTime,jdbcType=TIMESTAMP}
+      #{item.updateTime,jdbcType=TIMESTAMP},#{item.mm_whname,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>