增加查询条件

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java

@@ -32,6 +32,14 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
     @Autowired
     private MesPartShippingGroupDetailService shippingGroupDetailService;
 
+
+    protected void setPackQueryBean(MesShippingOrderManagement bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
+        DdlPreparedPack.timeBuilder(bean.getReleaseTimeStart(), bean.getReleaseTimeEnd(), "releaseTime", packBean, false);
+    }
+
     @Override
     public MesShippingOrderManagement insert(MesShippingOrderManagement bean) {
         //插入前构造数据
@@ -58,8 +66,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
 
             detail.setShippingOrderNo(finalBean.getShippingOrderNo());
             detail.setOrganizeCode(k.getOrganizeCode());
-//            ConvertBean.serviceModelInitialize(detail, "LML");
+            ConvertBean.serviceModelInitialize(detail, "LML");
-            ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
+//            ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
             BeanUtils.copyProperties(k, detail, "id");
             detailInsertList.add(detail);
         });
@@ -110,8 +118,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
                 MesShippingOrderManagementDetail detail = new MesShippingOrderManagementDetail();
 
                 detail.setOrganizeCode(k.getOrganizeCode());
-//                ConvertBean.serviceModelInitialize(detail, "LML");
+                ConvertBean.serviceModelInitialize(detail, "LML");
-                ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
+//                ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
                 BeanUtils.copyProperties(k, detail, "id");
                 detailInsertList.add(detail);
             });
@@ -122,8 +130,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         }
 
         onModifyBean();
-//        ConvertBean.serviceModelUpdate(bean, "LML");
+        ConvertBean.serviceModelUpdate(bean, "LML");
-        ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName());
+//        ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName());
         baseRDao.update(bean);
         return originBean;
     }