发运单子零件明细修改

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

@@ -202,7 +202,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
                 " from  mes_shipping_detail  sd " +
                 " left join mes_shipping s on s.id=sd.pid  " +
                 " WHERE  sd.status in (20) " +//todo 发运 20
-                " and sd.bar_code != '' and bar_code is not NULL ");
+                " and sd.bar_code != '' and sd.bar_code is not NULL ");
         hql.append(" and sd.organize_code = :organizeCode ");
         hql.append(" and sd.is_deleted = :isDeleted ");
         hql.append(" and sd.is_valid = :isValid ");
@@ -229,7 +229,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
             Object[] cells = (Object[]) result;
             MesShippingOrderManagementDetail model = new MesShippingOrderManagementDetail();
             model.setBarcode(StringUtils.isEmpty(cells[0]) ? "" : String.valueOf(cells[0]));
-            model.setPlanQty(StringUtils.isEmpty(cells[1]) ? 1 : Integer.parseInt(String.valueOf(cells[1])));
+            model.setPlanQty(StringUtils.isEmpty(cells[1]) ? 1 : Double.parseDouble(String.valueOf(cells[1])));
             model.setActualQty(StringUtils.isEmpty(cells[2]) ? 1 : Integer.parseInt(String.valueOf(cells[2])));
             model.setShippingCode(StringUtils.isEmpty(cells[3]) ? "" : String.valueOf(cells[3]));
             model.setPartNo(StringUtils.isEmpty(cells[4]) ? "" : String.valueOf(cells[4]));
@@ -285,7 +285,8 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
                 " wop.part_no, " +
                 " wop.part_name, " +
                 " wop.item_qty, " +
-                " wo.shipping_time " +
+                " wo.shipping_time, " +
+                " wop.mes_work_order " +
                 " from mes_work_order_part  wop  " +
                 " left join mes_work_order wo on wop.work_order_no=wo.work_order_no " );
         hql.append(" WHERE wop.organize_code = :organizeCode ");
@@ -325,6 +326,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
             model.setPartName(StringUtils.isEmpty(cells[2]) ? "" : String.valueOf(cells[2]));
             model.setItemQty(StringUtils.isEmpty(cells[3]) ? 1 : Double.parseDouble(String.valueOf(cells[3])));
             model.setShippingTime(StringUtils.isEmpty(cells[4]) ? "" : String.valueOf(cells[4]));
+            model.setWorkOrderNo(StringUtils.isEmpty(cells[5]) ? "" : String.valueOf(cells[5]));
             modelList.add(model);
         }
 

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

@@ -121,7 +121,6 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
         }
         bean.setShippingDetails(shippingDetails);
         int count = shippingOrderManagementDetailDao.queryDetailGroupByPartNo(bean);
-
         pager = PagerHelper.getPager(pager, count);
 
         modelList = shippingOrderManagementDetailDao.queryOrderDetailGroupByPartInfo(bean, pager);