销售出货、退货主表新增备注字段

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/ProdInOutDTO.java

@@ -71,6 +71,6 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private String pi_address;
 
-
+    private String pi_remark;
 
 }

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/ProdInOutListDTO.java

@@ -137,4 +137,5 @@ public class ProdInOutListDTO extends CommonBaseDTO implements Serializable {
 
     private String pd_remark;
 
+    private String pi_remark;
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/ProdInOutServiceImpl.java

@@ -106,6 +106,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOut.setPi_said(main.getPi_said());
         prodInOut.setPi_sacode(main.getPi_sacode());
 
+        prodInOut.setPi_remark(main.getPi_remark());
         //判断更新与保存动作
         if (StringUtils.isEmpty(pi_id) || "0".equals(pi_id.toString())){
             //插入操作
@@ -133,7 +134,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             setTotal(prodInOutNow);
             baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
             //日志记录
-            messageLogService.save(baseDTO);
+            //messageLogService.save(baseDTO);
             return baseDTO;
         }
         //更新操作
@@ -167,7 +168,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //更新明细金额等
         setTotal(prodInOutNow);
         //日志
-       messageLogService.update(baseDTO);
+       //messageLogService.update(baseDTO);
         return baseDTO;
 
     }
@@ -192,7 +193,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //更新明细金额等
         setTotal(prodInOut);
         //日志
-      messageLogService.deleteDetail(docBaseDTO);
+      //messageLogService.deleteDetail(docBaseDTO);
     }
 
     @Override
@@ -204,7 +205,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         setTotal(prodInOut);
         DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
         //日志
-       messageLogService.deleteDetail(docBaseDTO);
+       //messageLogService.deleteDetail(docBaseDTO);
         return num;
     }
 
@@ -263,7 +264,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             //记录日志
             DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
             //日志
-           messageLogService.audit(docBaseDTO);
+           //messageLogService.audit(docBaseDTO);
         }
     }
     @Override
@@ -315,7 +316,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             //记录日志
             DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
             //日志
-            messageLogService.unAudit(docBaseDTO);
+            //messageLogService.unAudit(docBaseDTO);
         }
     }
 
@@ -404,8 +405,9 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //插入销售退货单主表
         ProdInOut targetPi = new ProdInOut();
         //生成单号
-        String piInoutno  = maxnumberService.getMaxnumber(BillCodeSeq.SALEIN.getCaller(),true).getData();
-                //BillCodeSeq.SALEIN.getCaller()+Math.abs(Math.random()*100);
+        String piInoutno  =
+                //maxnumberService.getMaxnumber(BillCodeSeq.SALEIN.getCaller(),true).getData();
+                BillCodeSeq.SALEIN.getCaller()+Math.abs(Math.random()*100);
 
         //设置公司id
         targetPi.setCompanyId(sourcePi.getCompanyId());
@@ -477,7 +479,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
 
         //日志记录
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.SALEIN.getName());
-        messageLogService.customizeLog(baseDTO, Operation.TURNPRODOUTRETURN);
+        //messageLogService.customizeLog(baseDTO, Operation.TURNPRODOUTRETURN);
         return baseDTO;
 
     }
@@ -498,7 +500,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOutMapper.updateByPrimaryKeySelective(prodInOut);
         //记录日志
         DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class(),prodInOut.getPi_inoutno());
-        messageLogService.close(docBaseDTO);
+        //messageLogService.close(docBaseDTO);
         return docBaseDTO;
     }
 
@@ -533,7 +535,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOutMapper.updateByPrimaryKeySelective(prodInOut);
         //记录日志
         DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class(),prodInOut.getPi_inoutno());
-        messageLogService.open(docBaseDTO);
+        //messageLogService.open(docBaseDTO);
         return docBaseDTO;
     }
 
@@ -576,8 +578,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }else {//销售退货单
             caller = BillCodeSeq.SALEIN.getCaller();
         }
-        return  maxnumberService.pushMaxnubmer(count, code, caller).getData();
-        //return  caller+Math.abs(Math.random()*100);
+        return code;
+                //maxnumberService.pushMaxnubmer(count, code, caller).getData();
     }
 
     /**

applications/sale/sale-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -71,6 +71,7 @@
     <result column="pi_nettotal" jdbcType="DOUBLE" property="pi_nettotal" />
     <result column="pi_auditdate" jdbcType="TIMESTAMP" property="pi_auditdate" />
     <result column="pi_auditman" jdbcType="VARCHAR" property="pi_auditman" />
+    <result column="pi_remark" jdbcType="VARCHAR" property="pi_remark" />
   </resultMap>
 
 

applications/sale/sale-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -35,6 +35,7 @@
     <result column="pi_auditdate" jdbcType="TIMESTAMP" property="pi_auditdate" />
     <result column="pi_auditman" jdbcType="VARCHAR" property="pi_auditman" />
     <result column="pi_address" jdbcType="VARCHAR" property="pi_address" />
+    <result column="pi_remark" jdbcType="VARCHAR" property="pi_remark" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />
@@ -104,7 +105,7 @@
     companyid, updaterid, updatetime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5
   </sql>
   <sql id="Blob_Column_List">
-    pi_address
+    pi_address,pi_remark
   </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
@@ -129,7 +130,7 @@
       pi_printstatuscode, companyid, updaterid, 
       updatetime, pi_text1, pi_text2, 
       pi_text3, pi_text4, pi_text5,
-      pi_address)
+      pi_address,pi_remark)
     values (#{pi_id,jdbcType=INTEGER}, #{pi_inoutno,jdbcType=VARCHAR}, #{pi_class,jdbcType=VARCHAR}, 
       #{pi_date,jdbcType=TIMESTAMP}, #{pi_vendid,jdbcType=INTEGER}, #{pi_vendcode,jdbcType=VARCHAR}, 
       #{pi_vendname,jdbcType=VARCHAR}, #{pi_custid,jdbcType=INTEGER}, #{pi_custcode,jdbcType=VARCHAR}, 
@@ -140,7 +141,8 @@
       #{pi_printstatuscode,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{pi_text1,jdbcType=VARCHAR}, #{pi_text2,jdbcType=VARCHAR}, 
       #{pi_text3,jdbcType=VARCHAR}, #{pi_text4,jdbcType=VARCHAR}, #{pi_text5,jdbcType=VARCHAR}, 
-      #{pi_address,jdbcType=LONGVARCHAR})
+      #{pi_address,jdbcType=LONGVARCHAR},
+      #{pi_remark,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     <selectKey resultType="java.lang.Long" keyProperty="id">
@@ -239,6 +241,9 @@
       <if test="pi_address != null">
         pi_address,
       </if>
+      <if test="pi_remark != null">
+        pi_remark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -332,6 +337,9 @@
       <if test="pi_address != null">
         #{pi_address,jdbcType=LONGVARCHAR},
       </if>
+      <if test="pi_remark != null">
+        #{pi_remark,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
@@ -427,7 +435,9 @@
       <if test="pi_address != null">
         pi_address = #{pi_address,jdbcType=LONGVARCHAR},
       </if>
-
+      <if test="pi_remark != null">
+        pi_remark = #{pi_remark,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where pi_id = #{id,jdbcType=INTEGER}
   </update>
@@ -462,8 +472,8 @@
       pi_text3 = #{pi_text3,jdbcType=VARCHAR},
       pi_text4 = #{pi_text4,jdbcType=VARCHAR},
       pi_text5 = #{pi_text5,jdbcType=VARCHAR},
-      pi_address = #{pi_address,jdbcType=LONGVARCHAR}
-
+      pi_address = #{pi_address,jdbcType=LONGVARCHAR},
+      pi_remark = #{pi_remark,jdbcType=LONGVARCHAR}
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
@@ -496,7 +506,9 @@
       pi_text2 = #{pi_text2,jdbcType=VARCHAR},
       pi_text3 = #{pi_text3,jdbcType=VARCHAR},
       pi_text4 = #{pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{pi_text5,jdbcType=VARCHAR}
+      pi_text5 = #{pi_text5,jdbcType=VARCHAR},
+      pi_address = #{pi_address,jdbcType=LONGVARCHAR},
+      pi_remark = #{pi_remark,jdbcType=LONGVARCHAR}
     where pi_id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectCodeById" resultType="string" parameterType="long">

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

@@ -73,5 +73,5 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Date pi_auditman;
 
-
+    private String pi_remark;
 }

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

@@ -142,4 +142,5 @@ public class ProdInOutListDTO extends CommonBaseEntity implements Serializable {
 
     private String pd_remark;
 
+    private String pi_remark;
 }

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

@@ -69,5 +69,5 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_auditman;
 
-
+    private String pi_remark;
 }

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

@@ -144,4 +144,5 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private Double pi_nettotal;
 
+    private String pi_remark;
 }