6 changed files with 8 additions and 373 deletions
--- a/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java
+++ b/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java
@ -24,12 +24,6 @@ public class MaterialShipRequest extends FieldAccessor implements DataInfo<Mater
 	private Timestamp lastEventTime;
 	private String lastEventUser;
 	private String lastEventComment;
-
-	private String createTime;
-
-	private String createUser;
-
-	private String erpFactory;
 	
 	
 	// ERP升级项目--WMS25接口增加
@ -293,28 +287,5 @@ public class MaterialShipRequest extends FieldAccessor implements DataInfo<Mater
 	public void setSpecialComment(String specialComment) {
 		this.specialComment = specialComment;
 	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getCreateUser() {
-		return createUser;
-	}
-
-	public void setCreateUser(String createUser) {
-		this.createUser = createUser;
-	}
-
-	public String getErpFactory() {
-		return erpFactory;
-	}
-
-	public void setErpFactory(String erpFactory) {
-		this.erpFactory = erpFactory;
-	}
+	
 }
--- a/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java
+++ b/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java
@ -4,7 +4,6 @@ package com.cim.idm.wmspackage.materialshiprequestdetail.management.data;
 import com.cim.idm.framework.orm.info.DataInfo;
 import com.cim.idm.framework.orm.info.UserColumnMark;
 import com.cim.idm.framework.orm.info.access.FieldAccessor;
-import lombok.Getter;

 public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo<MaterialShipRequestDetailKey> {
 	private MaterialShipRequestDetailKey key;
@ -14,7 +13,6 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo
 	private String domesticExport;
 	private double requestQuantity;
 	private double assignedQuantity;
-
 	
 	
 	private String posid;
@ -185,8 +183,6 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo
 	private String workOrder;
 	@UserColumnMark
 	private String supplierNO;
-
-
 	public String getSupplierNO() {
 		return supplierNO;
 	}
@ -215,332 +211,6 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo
 	private String workOrderType;
 	@UserColumnMark
 	private String line;
-
-	public String getWidth() {
-		return width;
-	}
-
-	public void setWidth(String width) {
-		this.width = width;
-	}
-
-	public String getLength() {
-		return length;
-	}
-
-	public void setLength(String length) {
-		this.length = length;
-	}
-
-	public String getVolume() {
-		return volume;
-	}
-
-	public void setVolume(String volume) {
-		this.volume = volume;
-	}
-
-	public String getSalesorder() {
-		return salesorder;
-	}
-
-	public void setSalesorder(String salesorder) {
-		this.salesorder = salesorder;
-	}
-
-	public String getSalesorderdetailno() {
-		return salesorderdetailno;
-	}
-
-	public void setSalesorderdetailno(String salesorderdetailno) {
-		this.salesorderdetailno = salesorderdetailno;
-	}
-
-	public String getCustomerMaterial() {
-		return customerMaterial;
-	}
-
-	public void setCustomerMaterial(String customerMaterial) {
-		this.customerMaterial = customerMaterial;
-	}
-
-	public String getCustomerProduct() {
-		return customerProduct;
-	}
-
-	public void setCustomerProduct(String customerProduct) {
-		this.customerProduct = customerProduct;
-	}
-
-	public String getTexture() {
-		return texture;
-	}
-
-	public void setTexture(String texture) {
-		this.texture = texture;
-	}
-
-	public String getColor() {
-		return color;
-	}
-
-	public void setColor(String color) {
-		this.color = color;
-	}
-
-	public String getReleaseForce() {
-		return releaseForce;
-	}
-
-	public void setReleaseForce(String releaseForce) {
-		this.releaseForce = releaseForce;
-	}
-
-	public String getTubeCore() {
-		return tubeCore;
-	}
-
-	public void setTubeCore(String tubeCore) {
-		this.tubeCore = tubeCore;
-	}
-
-	public String getCustomerStash() {
-		return customerStash;
-	}
-
-	public void setCustomerStash(String customerStash) {
-		this.customerStash = customerStash;
-	}
-
-	public String getUnit() {
-		return unit;
-	}
-
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-
-	public String getReservedNumber() {
-		return reservedNumber;
-	}
-
-	public void setReservedNumber(String reservedNumber) {
-		this.reservedNumber = reservedNumber;
-	}
-
-	public String getReservedProjectNumb() {
-		return reservedProjectNumb;
-	}
-
-	public void setReservedProjectNumb(String reservedProjectNumb) {
-		this.reservedProjectNumb = reservedProjectNumb;
-	}
-
-	public String getReceiveProductionOrderNumber() {
-		return receiveProductionOrderNumber;
-	}
-
-	public void setReceiveProductionOrderNumber(String receiveProductionOrderNumber) {
-		this.receiveProductionOrderNumber = receiveProductionOrderNumber;
-	}
-
-	public String getIssueProductionOrderNumber() {
-		return issueProductionOrderNumber;
-	}
-
-	public void setIssueProductionOrderNumber(String issueProductionOrderNumber) {
-		this.issueProductionOrderNumber = issueProductionOrderNumber;
-	}
-
-	public String getProductionSupervisor() {
-		return productionSupervisor;
-	}
-
-	public void setProductionSupervisor(String productionSupervisor) {
-		this.productionSupervisor = productionSupervisor;
-	}
-
-	public String getCostCenter() {
-		return costCenter;
-	}
-
-	public void setCostCenter(String costCenter) {
-		this.costCenter = costCenter;
-	}
-
-	public String getCombinationOrderNumber() {
-		return combinationOrderNumber;
-	}
-
-	public void setCombinationOrderNumber(String combinationOrderNumber) {
-		this.combinationOrderNumber = combinationOrderNumber;
-	}
-
-	public String getZspec() {
-		return zspec;
-	}
-
-	public void setZspec(String zspec) {
-		this.zspec = zspec;
-	}
-
-	public String getUseDate() {
-		return useDate;
-	}
-
-	public void setUseDate(String useDate) {
-		this.useDate = useDate;
-	}
-
-	public String getSendSalesOrder() {
-		return sendSalesOrder;
-	}
-
-	public void setSendSalesOrder(String sendSalesOrder) {
-		this.sendSalesOrder = sendSalesOrder;
-	}
-
-	public String getSendSalesOrderDetailNo() {
-		return sendSalesOrderDetailNo;
-	}
-
-	public void setSendSalesOrderDetailNo(String sendSalesOrderDetailNo) {
-		this.sendSalesOrderDetailNo = sendSalesOrderDetailNo;
-	}
-
-	public String getSourceNo() {
-		return sourceNo;
-	}
-
-	public void setSourceNo(String sourceNo) {
-		this.sourceNo = sourceNo;
-	}
-
-	public String getReceiveSalesOrder() {
-		return receiveSalesOrder;
-	}
-
-	public void setReceiveSalesOrder(String receiveSalesOrder) {
-		this.receiveSalesOrder = receiveSalesOrder;
-	}
-
-	public String getReceiveSalesOrderDetailNo() {
-		return receiveSalesOrderDetailNo;
-	}
-
-	public void setReceiveSalesOrderDetailNo(String receiveSalesOrderDetailNo) {
-		this.receiveSalesOrderDetailNo = receiveSalesOrderDetailNo;
-	}
-
-	public String getErpReceiveFactory() {
-		return erpReceiveFactory;
-	}
-
-	public void setErpReceiveFactory(String erpReceiveFactory) {
-		this.erpReceiveFactory = erpReceiveFactory;
-	}
-
-	public String getCauseOfMovement() {
-		return causeOfMovement;
-	}
-
-	public void setCauseOfMovement(String causeOfMovement) {
-		this.causeOfMovement = causeOfMovement;
-	}
-
-	public double getReturnQuantity() {
-		return returnQuantity;
-	}
-
-	public void setReturnQuantity(double returnQuantity) {
-		this.returnQuantity = returnQuantity;
-	}
-
-
-	//NEW
-	@Getter
-	@UserColumnMark
-	private String width;
-	@UserColumnMark
-	private String length;
-	@UserColumnMark
-	private String volume;
-	@UserColumnMark
-	private String salesorder;
-	@UserColumnMark
-	private String salesorderdetailno;
-	@UserColumnMark
-	private String customerMaterial;
-	@UserColumnMark
-	private String customerProduct;
-	@UserColumnMark
-	private String texture;
-	@UserColumnMark
-	private String color;
-	@UserColumnMark
-	private String releaseForce;
-	@UserColumnMark
-	private String tubeCore;
-	@UserColumnMark
-	private String customerStash;
-	@UserColumnMark
-	private String unit;
-	@UserColumnMark
-	private String reservedNumber;
-	@UserColumnMark
-	private String reservedProjectNumb;
-	@UserColumnMark
-	private String receiveProductionOrderNumber;
-	@UserColumnMark
-	private String issueProductionOrderNumber;
-	@UserColumnMark
-	private String productionSupervisor;
-	@UserColumnMark
-	private String costCenter;
-	@UserColumnMark
-	private String combinationOrderNumber;
-	@UserColumnMark
-	private String zspec;
-	@UserColumnMark
-	private String useDate;
-	@UserColumnMark
-	private String sendSalesOrder;
-	@UserColumnMark
-	private String sendSalesOrderDetailNo;
-	@UserColumnMark
-	private String sourceNo;
-
-	@UserColumnMark
-	private String receiveSalesOrder;
-	@UserColumnMark
-	private String receiveSalesOrderDetailNo;
-	@UserColumnMark
-	private String erpReceiveFactory;
-	@UserColumnMark
-	private String causeOfMovement;
-	@UserColumnMark
-	private double returnQuantity;
-
-	public String getClosedFlag() {
-		return closedFlag;
-	}
-
-	public void setClosedFlag(String closedFlag) {
-		this.closedFlag = closedFlag;
-	}
-
-	public String getGoalMaterialSpec() {
-		return goalMaterialSpec;
-	}
-
-	public void setGoalMaterialSpec(String goalMaterialSpec) {
-		this.goalMaterialSpec = goalMaterialSpec;
-	}
-
-	@UserColumnMark
-	private String closedFlag;
-	@UserColumnMark
-	private String goalMaterialSpec;
 	
 	public String getWorkOrder() {
 		return workOrder;
@ -658,5 +328,4 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo
 	}


-
 }
--- a/zi-wms-environment/cmd/setenv.sh
+++ b/zi-wms-environment/cmd/setenv.sh
@ -11,7 +11,7 @@ fi
 JAVA_OPTS=" -Xms$3 -Xmx$4 -server "
 ### MWMS_OPTS
 IDMFRAME_FLOW_BPELJ=http://bpel.boe.com/bpelj
-COMPANY=SDK
+COMPANY=BOE
 FACTORY=ZXY
 CIM=MWMS
 SVR=$1
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/AllocateStockInController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/AllocateStockInController.java
@ -10,7 +10,6 @@ import com.cim.idm.utils.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@ -25,12 +24,7 @@ import javax.servlet.http.HttpServletResponse;
@Api(tags = "调拨入库")
 public class AllocateStockInController {

-    private final AllocateStockInService allocateStockInService;
-
-    // 构造器注入
-    public AllocateStockInController(AllocateStockInService allocateStockInService) {
-        this.allocateStockInService = allocateStockInService;
-    }
+    private AllocateStockInService allocateStockInService;

    /**
     * 调拨入库过账
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java
@ -990,7 +990,7 @@ public class SAPToWMSController {
 		try {
 			String shipRequestName ="";
 			ArrayList<Map<String,Object>> datas = request.getBODY();
-			String sitename = "SDK";
+			String sitename = System.getProperty("company");
 			for (Map<String, Object> data : datas) {
 				shipRequestName = MapUtils.getString(data, "ZDNUM");  // 领料单、预留订单号
 				String erpFactory = MapUtils.getString(data, "WERKS");  // ERP工厂
@ -1182,7 +1182,7 @@ public class SAPToWMSController {
 									eventInfo.setEventUser(createUser);
 									eventInfo.setEventName("CreateMaterialShipRequest");
 									
-									MaterialShipRequestDetailServiceProxy.getMaterialShipRequestDetailService().create(createInfo);
+									MaterialShipRequestDetailServiceProxy.getMaterialShipRequestDetailService().create( createInfo);
 								}else {
 									
 									NonPrimaryKeyValueInfo nonPrimaryKeyValueInfo = new NonPrimaryKeyValueInfo();
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java
@ -79,8 +79,9 @@ public class MoveTransformServiceImpl implements MoveTransformService {
            assignShipRequestInfo.setShipRequestName(shipRequestName);
            assignShipRequestInfo
                    .setShipRequestDetailName(shipRequestDetailName);
-            MaterialPackingServiceProxy.getMaterialPackingService().assignShipRequest(mpkList, eventInfo,assignShipRequestInfo);
-
+            MaterialPackingServiceProxy.getMaterialPackingService()
+                    .assignShipRequest(mpkList, eventInfo,
+                            assignShipRequestInfo);
                break;
                case "Dessign":
                    EventInfo eventInfo1 = EventInfoUtil.makeEventInfo("Dessign", userId, "解绑单据");