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/serviceimpl/base/MesWorkOrderService.java

@@ -1587,10 +1587,11 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         newMesProductOffLine.setItemUnit(mesBom.getItemUnit());
         newMesProductOffLine.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
         newMesProductOffLine.setWorkOrderType(mesWorkOrder.getWorkOrderType());
-        newMesProductOffLine.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
         newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode());
         newMesProductOffLine.setReportType(mesWorkOrder.getReportType());
-        newMesProductOffLine.setSapWorkCenter(mesWorkOrder.getErpWorkCenter());
+        newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode());
+        newMesProductOffLine.setSapWorkCenter(mesProductVersion.getWorkCenterCode());
+
         newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode());
         newMesProductOffLine.setDescription(nowTime);
         newMesProductOffLine.setBomCode(mesBom.getBomCode());