Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java

@@ -40,7 +40,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
         hql.append(" and msd.is_deleted = :isDeleted ");
         hql.append(" and msd.is_valid = :isValid ");
 
-        hql.append(" and msd.shipping_order_no = :shippingOrderNo ");
+        hql.append(" and msd.pid = :pid ");
 
         hql.append(" group by msd.part_no ,msd.part_name,msd.cust_part_no,msd.unit ");
 
@@ -48,7 +48,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
         query.setParameter("organizeCode", detail.getOrganizeCode());
         query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
-        query.setParameter("shippingCode", detail.getShippingCode());
+        query.setParameter("pid", detail.getPid());
 
         List list = query.getResultList();
 
@@ -68,8 +68,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
         hql.append(" where msd.organize_code = :organizeCode ");
         hql.append(" and msd.is_deleted = :isDeleted ");
         hql.append(" and msd.is_valid = :isValid ");
-
-        hql.append(" and msd.shipping_order_no = :shippingOrderNo ");
+        hql.append(" and msd.pid = :pid ");
 
         hql.append(" group by msd.part_no ,msd.part_name,msd.cust_part_no,msd.unit ");
 
@@ -77,7 +76,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
         query.setParameter("organizeCode", detail.getOrganizeCode());
         query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
-        query.setParameter("shippingCode", detail.getShippingCode());
+        query.setParameter("pid", detail.getPid());
 
 
         query.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize());

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

@@ -23,7 +23,7 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
     private IMesShippingOrderManagementDetailDao shippingOrderManagementDetailDao;
 
     protected void setPackQueryBean(MesShippingOrderManagementDetail bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getShippingCode(), "shippingCode", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustOrderNo(), "custOrderNo", packBean);
     }

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

@@ -175,7 +175,6 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
             detail.setCustPartNo(k.getCustPartNo());
             detail.setPlanQty(1);
             detail.setPid(finalBean.getId());
-            detail.setShippingCode(finalBean.getShippingCode());
             detail.setOrganizeCode(k.getOrganizeCode());
             detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());