zy-asrs-master.git

			@@ -4,6 +4,7 @@
			import java.util.Date;

			import com.zy.asrs.common.utils.Synchro;
			import com.zy.asrs.common.wms.service.OrderService;
			import org.springframework.format.annotation.DateTimeFormat;
			import java.text.SimpleDateFormat;
			import java.util.Date;
			@@ -287,11 +288,11 @@
			private Long wrkMastId;

			@ApiModelProperty(value= "货主")
			private Integer owner;
			private String owner;

			public WrkDetl() {}

			public WrkDetl(Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,Integer owner) {
			public WrkDetl(Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,String owner) {
			this.wrkNo = wrkNo;
			this.ioTime = ioTime;
			this.anfme = anfme;
			@@ -384,17 +385,6 @@
			}
			return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
			}
			public String getOwner$(){
			if (null == this.owner){ return null; }
			switch (this.owner){
			case 1:
			return "宁波";
			case 2:
			return "新昌";
			default:
			return String.valueOf(this.owner);
			}
			}
			public String getBeBatch$(){
			if (null == this.beBatch){ return null; }
			switch (this.beBatch){
			@@ -486,6 +476,20 @@
			return null;
			}

			public String getOrderType(){
			if(Cools.isEmpty(orderNo)){
			return "";
			}

			OrderService orderService = SpringUtils.getBean(OrderService.class);
			Order order = orderService.selectByNo(orderNo, hostId);
			if(!Cools.isEmpty(order)){
			return order.getDocType$();
			}

			return "";
			}

			public void sync(Object source) {
			Synchro.Copy(source, this);
			}