销售出货、退货关联列表查询问题

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

@@ -134,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;
         }
         //更新操作
@@ -168,7 +168,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //更新明细金额等
         setTotal(prodInOutNow);
         //日志
-       //messageLogService.update(baseDTO);
+       messageLogService.update(baseDTO);
         return baseDTO;
 
     }
@@ -193,7 +193,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //更新明细金额等
         setTotal(prodInOut);
         //日志
-      //messageLogService.deleteDetail(docBaseDTO);
+      messageLogService.deleteDetail(docBaseDTO);
     }
 
     @Override
@@ -205,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;
     }
 
@@ -264,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
@@ -316,7 +316,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             //记录日志
             DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
             //日志
-            //messageLogService.unAudit(docBaseDTO);
+            messageLogService.unAudit(docBaseDTO);
         }
     }
 
@@ -406,8 +406,8 @@ 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);
+                maxnumberService.getMaxnumber(BillCodeSeq.SALEIN.getCaller(),true).getData();
+               // BillCodeSeq.SALEIN.getCaller()+Math.abs(Math.random()*100);
 
         //设置公司id
         targetPi.setCompanyId(sourcePi.getCompanyId());
@@ -479,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;
 
     }
@@ -500,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;
     }
 
@@ -535,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;
     }
 
@@ -578,8 +578,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }else {//销售退货单
             caller = BillCodeSeq.SALEIN.getCaller();
         }
-        return code;
-                //maxnumberService.pushMaxnubmer(count, code, caller).getData();
+        return //code;
+                maxnumberService.pushMaxnubmer(count, code, caller).getData();
     }
 
     /**

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

@@ -76,25 +76,25 @@
 
 
   <select id="selectProdInOutListByCondition" resultMap="BaseResultMap">
-    select  *  from prodinout left join prodiodetail on pi_id = pd_piid
+    select  *  from prodinout
     <where>
       <if test="con != null">
         ${con}
       </if>
       <if test="companyId != null">
-        and   prodinout.companyId = #{companyId}
-      </if> order by pi_date desc,pi_id desc,pd_pdno
+        and companyId = #{companyId}
+      </if> order by pi_date desc,pi_id desc
     </where>
   </select>
 
   <select id="selectProdInOutBycondition"  resultMap="BaseResultMap">
-    select  *  from prodinout
+    select  *  from prodinout left join prodiodetail on pi_id = pd_piid left join product on pr_id = pd_prodid
       <where>
         <if test="con != null">
           ${con}
         </if>
         <if test="companyId != null">
-          and  companyId = #{companyId}
+          and  prodinout.companyId = #{companyId}
         </if>
       </where>
       order by pi_id desc