采购订单

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -2934,6 +2934,9 @@
         <if test="supplierCode!=null and supplierCode!=''">
             AND tms.sup_code LIKE concat('%', #{supplierCode}, '%')
         </if>
+        <if test="supplierType!=null and supplierType!=''">
+            AND tms.sup_type LIKE concat('%', #{supplierType}, '%')
+        </if>
         order by tms.sup_code
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -113,7 +113,7 @@ public class PurchaseService extends BaseService<Purchase> {
 		// 入库状态
 		purchasevo.setIntoStatus(Constant.IntoStatus.DAIRUKU.getName());
 		// 订单状态
-		purchasevo.setPurStatus(Constant.Status.STATUS_DEAL.getName());
+		purchasevo.setPurStatus(Constant.OrderStatus.STATUS_DEAL.getName());
 		// 获取单号
 		Map<String , Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.PURCHASE.getName(),false);
 		purchasevo.setPurId(codeMap.get("outId").toString());