zy-asrs.git - Gitblit

			@@ -4,8 +4,11 @@
			import com.baomidou.mybatisplus.annotations.TableId;
			import com.baomidou.mybatisplus.annotations.TableName;
			import com.baomidou.mybatisplus.enums.IdType;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.core.common.Cools;
			import com.core.common.SpringUtils;
			import com.zy.asrs.service.BasProcessProceduresService;
			import com.zy.asrs.service.BasQualityTestingService;
			import com.zy.asrs.service.OrderService;
			import com.zy.common.utils.Synchro;
			import com.zy.system.entity.User;
			@@ -17,6 +20,7 @@
			import java.io.Serializable;
			import java.text.SimpleDateFormat;
			import java.util.Date;
			import java.util.List;

			@Data
			@TableName("man_order_detl")
			@@ -308,7 +312,46 @@
			*/
			@ApiModelProperty(value= "行号")
			@TableField("line_number")
			private Integer lineNumber;
			private Long lineNumber;

			/**
			* 备用1
			*/
			@ApiModelProperty(value= "备用1")
			private String standby1 = "";

			/**
			* 备用2
			*/
			@ApiModelProperty(value= "备用2")
			private String standby2 = "";

			/**
			* 备用3
			*/
			@ApiModelProperty(value= "备用3")
			private String standby3 = "";

			/**
			* 备用1
			*/
			@ApiModelProperty(value= "备用1")
			@TableField("box_type1")
			private String boxType1 = "1";

			/**
			* 备用2
			*/
			@ApiModelProperty(value= "备用2")
			@TableField("box_type2")
			private String boxType2 = "1";

			/**
			* 备用3
			*/
			@ApiModelProperty(value= "备用3")
			@TableField("box_type3")
			private String boxType3 = "1";

			public OrderDetl() {}

			@@ -353,6 +396,54 @@
			this.updateTime = updateTime;
			this.memo = memo;
			}

			public OrderDetl(OrderDetl orderDetl) {
			this.orderId = orderDetl.getOrderId();
			this.orderNo = orderDetl.getOrderNo();
			this.anfme = orderDetl.getAnfme();
			this.qty = orderDetl.getQty();
			this.matnr = orderDetl.getMatnr();
			this.maktx = orderDetl.getMaktx();
			this.batch = orderDetl.getBatch();
			this.specs = orderDetl.getSpecs();
			this.model = orderDetl.getModel();
			this.color = orderDetl.getColor();
			this.brand = orderDetl.getBrand();
			this.unit = orderDetl.getUnit();
			this.price = orderDetl.getPrice();
			this.sku = orderDetl.getSku();
			this.units = orderDetl.getUnits();
			this.barcode = orderDetl.getBarcode();
			this.origin = orderDetl.getOrigin();
			this.manu = orderDetl.getManu();
			this.manuDate = orderDetl.getManuDate();
			this.itemNum = orderDetl.getItemNum();
			this.safeQty = orderDetl.getSafeQty();
			this.weight = orderDetl.getWeight();
			this.manLength = orderDetl.getManLength();
			this.volume = orderDetl.getVolume();
			this.threeCode = orderDetl.getThreeCode();
			this.supp = orderDetl.getSupp();
			this.suppCode = orderDetl.getSuppCode();
			this.beBatch = orderDetl.getBeBatch();
			this.deadTime = orderDetl.getDeadTime();
			this.deadWarn = orderDetl.getDeadWarn();
			this.source = orderDetl.getSource();
			this.inspect = orderDetl.getInspect();
			this.danger = orderDetl.getDanger();
			this.status = orderDetl.getStatus();
			this.createBy = orderDetl.getCreateBy();
			this.createTime = orderDetl.getCreateTime();
			this.updateBy = orderDetl.getUpdateBy();
			this.updateTime = orderDetl.getUpdateTime();
			this.memo = orderDetl.getMemo();
			this.pakinPakoutStatus = orderDetl.getPakinPakoutStatus();
			this.lineNumber = orderDetl.getLineNumber();
			this.standby1 = orderDetl.getStandby1();
			this.standby2 = orderDetl.getStandby2();
			this.standby3 = orderDetl.getStandby3();
			}


			public String getOrderId$(){
			OrderService service = SpringUtils.getBean(OrderService.class);
			@@ -474,7 +565,40 @@
			return "未完成";
			}

			public boolean beSimilar(OrderDetl orderDetl){
			return (
			this.orderNo.equals(orderDetl.getOrderNo())
			&& this.matnr.equals(orderDetl.getMatnr())
			&& this.batch.equals(orderDetl.getBatch())
			&& this.brand.equals(orderDetl.getBrand())
			&& this.standby1.equals(orderDetl.getStandby1())
			&& this.standby2.equals(orderDetl.getStandby2())
			&& this.standby3.equals(orderDetl.getStandby3())
			&& this.boxType1.equals(orderDetl.getBoxType1())
			&& this.boxType2.equals(orderDetl.getBoxType2())
			&& this.boxType3.equals(orderDetl.getBoxType3())
			);
			}

			public static OrderDetl find(List<OrderDetl> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
			if (Cools.isEmpty(matnr)) {
			return null;
			}
			for (OrderDetl detlDto : detlDtos) {
			if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
			&& brand.equals(detlDto.getBrand()) && standby1.equals(detlDto.getStandby1())
			&& standby2.equals(detlDto.getStandby2()) && standby3.equals(detlDto.getStandby3())
			&& boxType1.equals(detlDto.getBoxType1())
			&& boxType2.equals(detlDto.getBoxType2()) && boxType3.equals(detlDto.getBoxType3())
			) {
			return detlDto;
			}
			}
			return null;
			}

			public String getPakinPakoutStatus$(){
			if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
			switch (this.pakinPakoutStatus){
			case 1:
			return "Y";
			@@ -485,6 +609,23 @@
			}
			}

			public String getBoxType1$(){
			BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
			BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
			if (!Cools.isEmpty(processProcedures)){
			return String.valueOf(processProcedures.getBoxSpecs());
			}
			return this.boxType1;
			}

			public String getBoxType2$(){
			BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
			BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
			if (!Cools.isEmpty(basQualityTesting)){
			return String.valueOf(basQualityTesting.getBoxSpecs());
			}
			return this.boxType1;
			}

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