Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/jp/entity/JinpaiArrivalOrderEntity.java

@@ -0,0 +1,34 @@
+package com.logpm.factory.jp.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
+
+@Data
+@TableName("jinpai_arrival_order")
+@ApiModel(value = "JinpaiArrivalOrder对象", description = "金牌到达订单")
+@EqualsAndHashCode(callSuper = true)
+public class JinpaiArrivalOrderEntity extends BaseEntity {
+
+	private String warehouseName;
+	private String ddNum;
+	private String ysNum;
+	private String contractNumber;
+	private Date deliveryTime;
+	private String serviceType;
+	private String store;
+	private String storeCode;
+	private String arrivalStatus;
+	private Integer total;
+	private Date arrivalTime;
+	private String administrators;
+	private String truckNo;
+	private Date loadingTime;
+	private Date actualArrivalTime;
+	private String source;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/jp/entity/JinpaiOrgIdEntity.java

@@ -0,0 +1,18 @@
+package com.logpm.factory.jp.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("jinpai_org_id")
+@ApiModel(value = "JinpaiOrgId对象", description = "金牌组织id")
+@EqualsAndHashCode(callSuper = true)
+public class JinpaiOrgIdEntity extends BaseEntity {
+
+	private String orgId;
+	private String orgName;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/jp/entity/JinpaiPushScanLogEntity.java

@@ -0,0 +1,35 @@
+package com.logpm.factory.jp.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
+
+@Data
+@TableName("jinpai_push_scan_log")
+@ApiModel(value = "JinpaiPushScanLog对象", description = "金牌扫描记录")
+@EqualsAndHashCode(callSuper = true)
+public class JinpaiPushScanLogEntity extends BaseEntity {
+
+	private String warehouseName;
+	private String batchNumber;
+	private String ysNum;
+	private String contractNumber;
+	private String ddNum;
+	private String unitNo;
+	private String inStatus;
+	private String inType;
+	private String serviceType;
+	private Date deliveryTime;
+	private Date scanTime;
+	private Date arrivalTime;
+	private String store;
+	private String storeCode;
+	private String administrators;
+	private String source;
+
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java

@@ -65,9 +65,11 @@ public interface IWarehouseTrayGoodsClient {
 	Boolean delByTrayByCode(@RequestParam String code);
 	/**
 	 * 通过托盘id查询托盘上面的货物
+	 *
 	 * @param trayId
+	 * @param trayBarCode
 	 */
 	@PostMapping(GETTRAYIDLIST)
-	List<WarehouseTrayGoodsEntity> getTrayIdList(@RequestParam String trayId);
+	List<WarehouseTrayGoodsEntity> getTrayIdList(@RequestParam String trayId,@RequestParam String trayBarCode);
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -320,6 +320,10 @@ public class DistributionStockupAppController extends BladeController {
 				log.warn("##############allocationId: 货位状态为空 allocationId={}", allocationId);
 				return R.fail(3002, "货位id为空");
 			}
+			if (ObjectUtils.isNull(allocationId)) {
+				log.warn("##############allocationId: 货位状态为空 allocationId={}", allocationId);
+				return R.fail(3002, "货位id为空");
+			}
 
 			if (Objects.isNull(stockListId)) {
 				return R.fail(3002, "库存品id为空");
@@ -369,14 +373,15 @@ public class DistributionStockupAppController extends BladeController {
 	@PostMapping("/scanningCode")
 	@ApiOperation(value = "整托备货")
 	public R scanningCodelist(@RequestBody StockupDTO stockupDTO) {
+		log.debug("=====整托数据：{}",stockupDTO);
 		if (ObjectUtils.isNull(stockupDTO.getStockupId())) {
 			return R.fail(3002, "备货id不能为空");
 		}
 		if (ObjectUtils.isNull(stockupDTO.getReservationId())) {
 			return R.fail(3002, "预约Id不能为空");
 		}
-		if (ObjectUtils.isNull(stockupDTO.getTrayId())) {
+		if (ObjectUtils.isNull(stockupDTO.getTrayBarCode())) {
-			return R.fail(3002, "托盘ID不能为空");
+			return R.fail(3002, "托盘码不能为空");
 		}
 		R b = distributionStockupService.addPackTrayList(stockupDTO);
 		return b;
@@ -393,10 +398,10 @@ public class DistributionStockupAppController extends BladeController {
 			return R.data(list);
 		}
 		List<DistributionStockupTrayVO>  listMarket =  distributionStockupService.getLocationMarketSelection(stockupDTO);
-		if(!listMarket.isEmpty() && ObjectUtils.isNotNull(listMarket.size())){
+		if(!listMarket.isEmpty() && ObjectUtils.isNotNull(listMarket.get(0))){
 			return R.data(listMarket);
 		}
-		return R.fail(3002,"当前物料未上架，请上架后在继续备货操作！！！");
+		return Resp.scanFail("当前待备货的库存品未上架，请上架后在继续备货操作！！！","当前待备货的库存品未上架，请上架后在继续备货操作！！！");
 	}
 
 
@@ -516,6 +521,7 @@ public class DistributionStockupAppController extends BladeController {
 							WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
 							warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId());
 							warehouseUpdownGoodsEntity.setAssociationValue(stockupDTO.getPacketBarCode());
+							warehouseUpdownGoodsEntity.setWarehouseId(distributionStockupEntity.getWarehouseId());
 							WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationInformation(warehouseUpdownGoodsEntity);
 							entity.setAllocationTitle(locationInformation.getPositionCode());
 							entity.setAllocationId(stockupDTO.getAllocationId());
@@ -615,10 +621,12 @@ public class DistributionStockupAppController extends BladeController {
 				warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId());
 				warehouseUpdownGoodsEntity.setIncomingBatch(byId.getIncomingBatch());
 				warehouseUpdownGoodsEntity.setMarketId(byId.getMarketId());
+				warehouseUpdownGoodsEntity.setAssociationId(byId.getMaterialId());
 				warehouseUpdownGoodsEntity.setAssociationType("4");
+				warehouseUpdownGoodsEntity.setWarehouseId(byId.getWarehouseId());
 				WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity);
 				if(ObjectUtils.isNull(locationInformation)){
-					return Resp.scanFail("当前货位的本物料已为0，请更换货位继续！！", "当前货位的本物料已为0，请更换货位继续！！");
+					return Resp.scanFail("当前货位的库存品已为零，请更换货位继续！！", "当前货位的库存品已为零，请更换货位继续！！");
 				}
 				Integer i = distributionStockupService.selectPackagePrint(stockupDTO);
 				switch (i) {
@@ -659,6 +667,7 @@ public class DistributionStockupAppController extends BladeController {
 											JSONObject jsonObject = new JSONObject();
 											jsonObject.put("marketId",byId.getMarketId());
 											jsonObject.put("materialCode",byId.getMarketCode());
+											jsonObject.put("warehouseId",byId.getWarehouseId());
 											jsonObject.put("incomingBatch",byId.getIncomingBatch());
 											jsonObject.put("enterNum",1);
 											jsonObject.put("allocationId",stockupDTO.getAllocationId());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java

@@ -33,6 +33,8 @@ public class StockupDTO implements Serializable {
 
 	private String allocation;//库位信息
 	private Long allocationId;//库位信息ID
+	private String allocationCode;//库位信息ID
+	private String allocationType;//库位信息ID
 
 	private String pallet;//托盘
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -230,7 +230,8 @@
         from logpm_distribution_reservation_stocklist ldrs
         left join logpm_distribution_stock_list ldst on ldst.id = ldrs.stocklist_id and ldst.is_deleted = 0
         left join logpm_distribution_stock ldss on ldss.stock_list_id = ldst.id and ldss.reservation_id = #{reservationId} and ldss.is_deleted = 0
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldst.material_id and lwug.association_type = '4'  and ldst.market_id = lwug.market_id and ldst.incoming_batch = lwug.incoming_batch
+        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldst.material_id and lwug.association_type = '4'
+        and ldst.market_id = lwug.market_id and ldst.incoming_batch = lwug.incoming_batch and ldst.warehouse_id = lwug.warehouse_id
         where ldrs.reservation_id = #{reservationId}
         and ldrs.is_deleted = 0
         group by ldst.id, ldst.storage_location, ldst.description_goods,  ldst.sku,ldrs.id,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -72,7 +72,7 @@
         from logpm_distribution_reservation_stocklist ldrs
         LEFT JOIN logpm_distribution_stock_list ldsl on ldrs.stocklist_id  = ldsl.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id and lwug.association_type = '4'  and ldsl.market_id = lwug.market_id
-        and ldsl.incoming_batch = lwug.incoming_batch
+        and ldsl.incoming_batch = lwug.incoming_batch and ldsl.warehouse_id = lwug.warehouse_id
         where ldrs.id = #{param.deliveryDetailsId}
     </select>
     <select id="getLocationSelection" resultType="com.logpm.distribution.vo.DistributionStockupTrayVO">
@@ -80,17 +80,18 @@
         from logpm_distribution_delivery_details lddd
         LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id  = ldsl.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id and lwug.association_type = '4'  and ldsl.market_id = lwug.market_id
-        and ldsl.incoming_batch = lwug.incoming_batch
+        and ldsl.incoming_batch = lwug.incoming_batch and ldsl.warehouse_id = lwug.warehouse_id
         where lddd.id = #{param.deliveryDetailsId}
         GROUP BY lwug.position_code ,lwug.allocation_id,lwug.allocation_title,lwug.num
     </select>
     <select id="stockupOffShelf" resultType="com.logpm.distribution.vo.DistributionStockupSelfVO">
         select  lwug.id lwugId,lds.id ldsId,ldrp.packet_bar_code orderPackageCode,lwug.allocation_id allocationId
-        from logpm_distribution_reservation_package ldrp
+        from logpm_distribution_reservation ldr
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id  = ldrp.parce_list_id and lwug.association_type = 3
+        LEFT JOIN logpm_distribution_reservation_package ldrp on ldr.id = ldrp.reservation_id
+        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id  = ldrp.parce_list_id and lwug.association_type = 3 and  ldr.warehouse_id = lwug.warehouse_id
         LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldrp.parce_list_id
         <where>
-            ldrp.packet_bar_status in (1,3)  and  ldrp.reservation_id = #{param.reservationId}
+            ldrp.packet_bar_status in (1,3)  and  ldr.id = #{param.reservationId}
         </where>
     </select>
 
@@ -363,7 +364,8 @@
         ) realNum,lddd.id deliveryDetailsId
         from logpm_distribution_delivery_details lddd
         LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id  = ldsl.id
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id and lwug.association_type = '4'  and ldsl.market_id = lwug.market_id and ldsl.incoming_batch = lwug.incoming_batch
+        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id and lwug.association_type = '4'
+        and ldsl.market_id = lwug.market_id and ldsl.incoming_batch = lwug.incoming_batch and ldsl.warehouse_id = lwug.warehouse_id
         where lddd.bill_lading_id =  #{reservationId}
         GROUP BY lddd.stock_list_id,ldsl.description_goods,ldsl.sku,ldsl.cargo_norms,lddd.quantity,ldsl.cargo_unit,ldsl.tray_name,ldsl.unpack,lddd.id
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataCodeClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.distribution.bean.Resp;
 import com.logpm.distribution.dto.app.StockupDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionStockupExcel;
@@ -48,6 +49,7 @@ import org.springblade.common.constant.stocklist.StockStatusConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
 import org.springblade.common.exception.CustomerException;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -69,7 +71,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 备货信息表 服务实现类
@@ -191,7 +192,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					//自提
 					List<DistributionStockListSelfNumVO> distributionStockListSelfNumVOS = distributionStockupInfoService.selectStockListSelfNum(s);
 
-					if (distributionStockListSelfNumVOS.size() > 0) {
+					if (!distributionStockListSelfNumVOS.isEmpty()) {
 						List<DisStockListDetailEntity> listDetailEntities = new ArrayList<>();
 
 						distributionStockListSelfNumVOS.forEach(i -> {
@@ -215,7 +216,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 								}
 							}
 						});
-						if (listDetailEntities.size() > 0) {
+						if (!listDetailEntities.isEmpty()) {
 							disStockListDetailService.saveBatch(listDetailEntities);
 						}
 
@@ -1413,16 +1414,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			}
 		}else {
 			log.warn("预约信息不存在！");
-			return R.fail(3001, "备货失败！");
+			return Resp.scanFail("预约信息不存在", "预约信息不存在！");
 		}
 		if(list.size() < 1){
 			log.warn("包件信息不存在！");
-			return R.fail(3001, "备货失败！");
+			return Resp.scanFail("包件信息不存在", "包件信息不存在！");
 		}
 		//查询托盘上面的包件
-		List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(stockupDTO.getTrayId());
+
+		List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(stockupDTO.getTrayId(),stockupDTO.getTrayBarCode());
 		List<DistributionStockPackageVO> voList = new ArrayList<>();
 		List<DistributionStockPackageVO> finalList = list;
+		if(trayIdList.isEmpty()){
+			return Resp.scanFail("托盘信息错误！！！", "托盘信息错误！！！");
+		}
 		trayIdList.forEach(t -> {
 			boolean b = finalList.stream().anyMatch(l -> l.getParcelListId().equals(t.getAssociationId()));
 			if (b) {
@@ -1439,7 +1444,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			}
 		});
 		if (stock.get()) {
-			return R.fail(3001, "备货失败！");
+			return Resp.scanFail("备货失败", "备货失败！");
 		} else {
 			List<DistributionStockEntity> list1 = new ArrayList<>();
 			voList.forEach(i -> {
@@ -1453,7 +1458,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					parcelList.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
 					distributionParcelListService.updateById(parcelList);
 					//货位下架
-//				    warehouseUpdownTypeClient.downPackage(i.getPacketBarCode());
+					R r = warehouseUpdownTypeClient.downPackage(i.getPacketBarCode(), parcelList.getWarehouseId());
+					if(!r.isSuccess()){
+						throw new ServiceException("下架失败！！");
+					}
 					//判断备货任务是否完成
 					if(one.getStockUpType().equals("3")){
 						distributionAsyncService.stockupSelfUpdateState(stockupDTO);
@@ -1469,6 +1477,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
 					warehouseUpdownGoodsEntity.setAssociationId(i.getParcelListId());
 					warehouseUpdownGoodsEntity.setAssociationValue(i.getPacketBarCode());
+					warehouseUpdownGoodsEntity.setWarehouseId(byId.getWarehouseId());
 					WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationInformation(warehouseUpdownGoodsEntity);
 					if(ObjectUtils.isNotNull(locationInformation)){
 						distributionStock.setAllocationTitle(locationInformation.getPositionCode());
@@ -1523,7 +1532,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				while (iterator.hasNext()) {
 					if (i.getTrayId().equals(iterator.next().getTrayId())) {
 						Integer trayPackNum = iterator.next().getTrayPackNum(); //在这个托盘的数量
-						List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(i.getTrayId().toString());
+						String trayIdCode = "";
+						List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(i.getTrayId().toString(),trayIdCode);
 						if (trayPackNum.equals(trayIdList.size())) {
 							trays.set(true);
 						}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/bean/ApiResponse.java

@@ -0,0 +1,17 @@
+package com.logpm.factory.jp.bean;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ApiResponse<T> {
+
+	private int code;
+	private String message;
+	private T data;
+	private List<T> rows;
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/bean/LoginRes.java

@@ -0,0 +1,107 @@
+package com.logpm.factory.jp.bean;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LoginRes implements RCookie {
+
+	private String userId;
+
+	private String account;
+
+	private String nickname;
+
+	private String passwordExpirationTime;
+
+	private String username;
+
+	private String password;
+
+	private int sex;
+
+	private int age;
+
+	private String phone;
+
+	private int status;
+
+	private String organizationId;
+
+	private String createTime;
+
+	private String creator;
+
+	private String syscode;
+
+	private String sysname;
+
+	private String orgId;
+
+	private String systemdef;
+
+	private String companyPid;
+
+	private String companyPname;
+
+	private String companyId;
+
+	private String orgName;
+
+	private boolean forceModifyPwd;
+
+	private String customerAuthority;
+
+	private String loginTime;
+
+	private String activeTime;
+
+	private String isEnable;
+
+	private String printFlag;
+
+	private String memberType;
+
+	private String logoUrl;
+
+	private String baseLine;
+
+	private String twoCodeFlag;
+
+	private String labelNewServerSwitch;
+
+	private String mongoBaselineSwitch;
+
+	private String switchConsignerCodeMust;
+
+	private String enterpriseName;
+
+	private int crmVisitSwitch;
+
+	private String switchUserConsignerAdd;
+
+	private String switchSmsCheckOpen;
+
+	private String orgType;
+
+	private String ucgn;
+
+	private String fydFlag;
+
+	private String email;
+
+	private OriginalOrg originalOrg;
+
+	private String originalOrgIndex;
+
+	private NowOrg nowOrg;
+
+	private int nowOrgIndex;
+
+	private List<OwnedOrgs> ownedOrgs;
+
+	public String cookie;
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/bean/NowOrg.java

@@ -0,0 +1,15 @@
+package com.logpm.factory.jp.bean;
+
+import lombok.Data;
+
+@Data
+public class NowOrg {
+
+	private String id;
+
+	private String code;
+
+	private String name;
+
+	private String orgType;
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/bean/OriginalOrg.java

@@ -0,0 +1,16 @@
+package com.logpm.factory.jp.bean;
+
+import lombok.Data;
+
+@Data
+public class OriginalOrg {
+
+	private String id;
+
+	private String code;
+
+	private String name;
+
+	private String orgType;
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/bean/OwnedOrgs.java

@@ -0,0 +1,16 @@
+package com.logpm.factory.jp.bean;
+
+import lombok.Data;
+
+@Data
+public class OwnedOrgs {
+
+	private String id;
+
+	private String code;
+
+	private String name;
+
+	private String orgType;
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/bean/PushScanLog.java

@@ -0,0 +1,65 @@
+package com.logpm.factory.jp.bean;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PushScanLog {
+
+	@JsonProperty("REMARK")
+	private String remark;
+	@JsonProperty("SYSCODE")
+	private String sysCode;
+	private String arriveOrgId;
+	private String arriveOrgName;
+	private Integer checkFlag;
+	private String containerId;
+	private String deliveryMode;
+	private String extBoxCode;
+	private String goodsName;
+	private Integer goodsNumber;
+	private Integer goodsNumberOrder;
+	private String goodsShelves;
+	private String goodsShelvesName;
+	private BigDecimal goodsVolume;
+	private BigDecimal goodsVolumeOrder;
+	private Integer inventoryStatus;
+	private String lastOutboundTime;
+	private String manualContractNo;
+	private String omsExtOrderNo;
+	private String omsExtYsId;
+	private String orgId;
+	private String orgName;
+	private String outStockTime;
+	private Integer outboundQuantities;
+	private String outboundTime;
+	private String realEndTime;
+	private Integer receiptQuantities;
+	private Integer receiptStatus;
+	private String receiptTime;
+	private String receiveType;
+	private String receivingBatchId;
+	private String recvSite;
+	private Integer rowId;
+	private String sendTime;
+	private String shopCode;
+	private String shopName;
+	private String storageLocLabel;
+	private String subLabel;
+	private Integer subLabelPrintFlag;
+	private String subLabelPrintSeq;
+	private String toContainerIdFlag;
+	private Integer toStorageLocFlag;
+	private String transportId;
+	private String updateName;
+	private String updateTime;
+	private String warehouseArea;
+	private String warehouseAreaName;
+	private String yjInstallAddr;
+	private String yjInstallLinker;
+	private String yjInstallPhone;
+	private String yjOrderNo;
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/bean/RCookie.java

@@ -0,0 +1,9 @@
+package com.logpm.factory.jp.bean;
+
+public interface RCookie {
+
+	String getCookie();
+
+	void setCookie(String cookie);
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/bean/Tran.java

@@ -0,0 +1,164 @@
+package com.logpm.factory.jp.bean;
+
+import lombok.Data;
+
+@Data
+public class Tran {
+
+	private String id;
+
+	private String orgId;
+
+	private String transportId;
+
+	private String shipId;
+
+	private String shipItemId;
+
+	private String startStockId;
+
+	private String writtenOrderId;
+
+	private String shipWrittenOrderId;
+
+	private String orderId;
+
+	private String customerOrderId;
+
+	private String transportType;
+
+	private String sendSite;
+
+	private String recvSite;
+
+	private String recvContactsId;
+
+	private String receContantsName;
+
+	private String revcMobile;
+
+	private String recvPhone;
+
+	private String recvAddress;
+
+	private String shareFee;
+
+	private String codAmount;
+
+	private String goodsNo;
+
+	private String goodsType;
+
+	private String goodsName;
+
+	private String goodsPack;
+
+	private String goodsNumber;
+
+	private String goodsWeight;
+
+	private String goodsGrossWeight;
+
+	private String goodsNetWeight;
+
+	private String goodsVolume;
+
+	private String goodsAmount;
+
+	private String customerNum;
+
+	private String goodsLength;
+
+	private String goodsWidth;
+
+	private String goodsHeigth;
+
+	private String creator;
+
+	private String createTime;
+
+	private String updateId;
+
+	private String updateTime;
+
+	private String arriveFlag;
+
+	private String arriveTime;
+
+	private String arriveUserId;
+
+	private String flag;
+
+	private String remark;
+
+	private String version;
+
+	private String transportWay;
+
+	private String carriageMode;
+
+	private String carrierName;
+
+	private String carrierContacts;
+
+	private String carrierMobile;
+
+	private String carrierPhone;
+
+	private String carNo;
+
+	private String driverName;
+
+	private String driverMobile;
+
+	private String driverPhone;
+
+	private String planBeginTime;
+
+	private String realBeginTime;
+
+	private String planEndTime;
+
+	private String isEnable;
+
+	private String arriveOrgId;
+
+	private String arriveOrgName;
+
+	private int isAlter;
+
+	private String omsExtYsId;
+
+	private String omsExtOrderNo;
+
+	private String sendTime;
+
+	private String manualContractNo;
+
+	private String shopCode;
+
+	private String shopName;
+
+	private String deliveryMode;
+
+	private String deliveryModeName;
+
+	private String transportStatus;
+
+	private String receiverName;
+
+	private String requireRecvTime;
+
+	private String yjOrderNo;
+
+	private String yjUrgentDate;
+
+	private String yjUrgentType;
+
+	private String arrivalAdvice;
+
+	private String arrivalAdviceName;
+
+	private String arrivalAdviceTime;
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/jobhandler/PullJpDataJob.java

@@ -0,0 +1,236 @@
+package com.logpm.factory.jp.jobhandler;
+
+import cn.hutool.crypto.digest.DigestUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.logpm.factory.jp.bean.*;
+import com.logpm.factory.jp.entity.JinpaiArrivalOrderEntity;
+import com.logpm.factory.jp.entity.JinpaiOrgIdEntity;
+import com.logpm.factory.jp.entity.JinpaiPushScanLogEntity;
+import com.logpm.factory.jp.service.IJinpaiArrivalOrderService;
+import com.logpm.factory.jp.service.IJinpaiOrgIdService;
+import com.logpm.factory.jp.service.IJinpaiPushScanLogService;
+import com.logpm.factory.jp.util.JsonUtil;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.utils.CommonUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@AllArgsConstructor
+@Component
+public class PullJpDataJob {
+
+	private final IJinpaiOrgIdService jinpaiOrgIdService;
+	private final IJinpaiArrivalOrderService jinpaiArrivalOrderService;
+	private final IJinpaiPushScanLogService jinpaiPushScanLogService;
+
+	@XxlJob("pullJpData")
+	public ReturnT<String> pullJpData(String param) {
+		log.info("############pullJpData: 拉取金牌数据开始 param={}",param);
+		List<JinpaiOrgIdEntity> list = new ArrayList<>();
+		if(StringUtil.isBlank(param)){
+			list = jinpaiOrgIdService.list();
+		}else{
+			QueryWrapper<JinpaiOrgIdEntity> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("org_id",param);
+			JinpaiOrgIdEntity orgIdEntity = jinpaiOrgIdService.getOne(queryWrapper);
+			if(Objects.isNull(orgIdEntity)){
+				log.warn("############pullJpData: 未查询到正确的key值");
+				return ReturnT.FAIL;
+			}
+			list.add(orgIdEntity);
+		}
+
+		try{
+
+			//获取昨天的日子
+			Calendar cal  =   Calendar.getInstance();
+			cal.add(Calendar.DATE,  -1);
+			String yesterday = new SimpleDateFormat( "yyyy-MM-dd ").format(cal.getTime());
+			log.info("############pullJpData: 同步{}的数据开始",yesterday);
+
+			//登陆【登陆结果中有组织列表】
+			LoginRes loginRes = login("17340091775", "ht88888888", "3369");
+
+			for (JinpaiOrgIdEntity entity:list){
+				String key = entity.getOrgId();
+				String name = entity.getOrgName();
+				log.info("############pullJpData: 目前处理{}的数据",name);
+				//切换组织【组织切换后，loginRes单cookie会被覆盖】
+				if(!"成都仓".equals(name)){
+					swapOrga(loginRes, key);
+				}
+				int arrivePage = 1;
+				while(true){
+					//查询DD单 arriver
+					List<Tran> trans = arriveTrans(loginRes, arrivePage, yesterday,yesterday);
+					if(!Objects.isNull(trans) && trans.size() != 0){
+						List<JinpaiArrivalOrderEntity> arrivalOrderEntities = new ArrayList<>();
+						for (Tran tran:trans){
+							String omsExtOrderNo = tran.getOmsExtOrderNo();
+							log.info("############pullJpData: 目前处理{}的数据",omsExtOrderNo);
+							JinpaiArrivalOrderEntity jinpaiArrivalOrderEntity = new JinpaiArrivalOrderEntity();
+							jinpaiArrivalOrderEntity.setWarehouseName(tran.getArriveOrgName());
+							jinpaiArrivalOrderEntity.setYsNum(tran.getOmsExtYsId());
+							jinpaiArrivalOrderEntity.setContractNumber(tran.getManualContractNo());
+							jinpaiArrivalOrderEntity.setDdNum(tran.getOmsExtOrderNo());
+							jinpaiArrivalOrderEntity.setDeliveryTime(StringUtil.isBlank(tran.getSendTime())?null:CommonUtil.StringToDate(tran.getSendTime()));
+							jinpaiArrivalOrderEntity.setServiceType(tran.getDeliveryModeName());
+							jinpaiArrivalOrderEntity.setStore(tran.getShopName());
+							jinpaiArrivalOrderEntity.setStoreCode(tran.getShopCode());
+							jinpaiArrivalOrderEntity.setArrivalStatus(tran.getArriveFlag());
+							jinpaiArrivalOrderEntity.setTotal(Integer.parseInt(tran.getGoodsNumber()));
+							jinpaiArrivalOrderEntity.setArrivalTime(StringUtil.isBlank(tran.getPlanEndTime())?null:CommonUtil.StringToDate(tran.getPlanEndTime()));
+							jinpaiArrivalOrderEntity.setAdministrators(tran.getArrivalAdviceName());
+							jinpaiArrivalOrderEntity.setTruckNo(tran.getTransportId());
+							jinpaiArrivalOrderEntity.setLoadingTime(StringUtil.isBlank(tran.getCreateTime())?null:CommonUtil.StringToDate(tran.getCreateTime()));
+							jinpaiArrivalOrderEntity.setActualArrivalTime(StringUtil.isBlank(tran.getArriveTime())?null:CommonUtil.StringToDate(tran.getArriveTime()));
+							jinpaiArrivalOrderEntity.setSource("3369");
+							arrivalOrderEntities.add(jinpaiArrivalOrderEntity);
+						}
+						jinpaiArrivalOrderService.saveBatch(arrivalOrderEntities);
+					}else{
+						break;
+					}
+					arrivePage++;
+				}
+
+				//拉取推动数据
+				int pushPage = 1;
+				while(true){
+					//查询DD单 arriver
+					List<PushScanLog> pushScanLogs = pushScanLog(loginRes, pushPage, yesterday,yesterday);
+					if(!Objects.isNull(pushScanLogs) && pushScanLogs.size() != 0){
+						List<JinpaiPushScanLogEntity> pushScanLogEntities = new ArrayList<>();
+						for (PushScanLog pushScanLog:pushScanLogs){
+							String extBoxCode = pushScanLog.getExtBoxCode();
+							log.info("############pullJpData: 目前处理推送{}的数据",extBoxCode);
+							JinpaiPushScanLogEntity jinpaiPushScanLogEntity = new JinpaiPushScanLogEntity();
+							jinpaiPushScanLogEntity.setWarehouseName(pushScanLog.getOrgName());
+							jinpaiPushScanLogEntity.setBatchNumber(pushScanLog.getReceivingBatchId());
+							jinpaiPushScanLogEntity.setYsNum(pushScanLog.getOmsExtYsId());
+							jinpaiPushScanLogEntity.setContractNumber(pushScanLog.getManualContractNo());
+							jinpaiPushScanLogEntity.setDdNum(pushScanLog.getOmsExtOrderNo());
+							jinpaiPushScanLogEntity.setUnitNo(pushScanLog.getExtBoxCode());
+							jinpaiPushScanLogEntity.setInStatus(pushScanLog.getReceiptStatus()+"");
+							jinpaiPushScanLogEntity.setInType(pushScanLog.getReceiveType());
+							jinpaiPushScanLogEntity.setDeliveryTime(StringUtil.isBlank(pushScanLog.getSendTime())?null:CommonUtil.StringToDate(pushScanLog.getSendTime()));
+							jinpaiPushScanLogEntity.setScanTime(StringUtil.isBlank(pushScanLog.getReceiptTime())?null:CommonUtil.StringToDate(pushScanLog.getReceiptTime()));
+							jinpaiPushScanLogEntity.setArrivalTime(StringUtil.isBlank(pushScanLog.getRealEndTime())?null:CommonUtil.StringToDate(pushScanLog.getRealEndTime()));
+							jinpaiPushScanLogEntity.setStore(pushScanLog.getShopName());
+							jinpaiPushScanLogEntity.setStoreCode(pushScanLog.getShopCode());
+							jinpaiPushScanLogEntity.setAdministrators(pushScanLog.getUpdateName());
+							jinpaiPushScanLogEntity.setSource("3369");
+							pushScanLogEntities.add(jinpaiPushScanLogEntity);
+						}
+						jinpaiPushScanLogService.saveBatch(pushScanLogEntities);
+					}else{
+						break;
+					}
+					pushPage++;
+				}
+			}
+		}catch (Exception e){
+			log.error("系统问题",e);
+			return ReturnT.FAIL;
+		}
+		return ReturnT.SUCCESS;
+	}
+
+
+	private LoginRes login(String account,String password,String syscode){
+		HttpRequest httpRequest = HttpUtil.createPost("https://yjtms.yuanfusc.com/tms/system/loginIn.do");
+		httpRequest.body("account="+account+"&password="+ DigestUtil.sha256Hex(password)+"&syscode="+syscode);
+		httpRequest.header("User-Agent","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36");
+		httpRequest.header("Referer","https://yjtms.yuanfusc.com/");
+		HttpResponse httpResponse = httpRequest.execute();
+		String cookie = httpResponse.header("Set-Cookie");
+		ApiResponse<LoginRes> apiResponse = JsonUtil.toBean(httpResponse.bodyBytes(), new TypeReference<ApiResponse<LoginRes>>() {
+		});
+		if (apiResponse.getCode() != 0)throw new RuntimeException(apiResponse.getMessage());
+		apiResponse.getData().setCookie(cookie);
+		return apiResponse.getData();
+	}
+
+
+	private List<Tran> arriveTrans(RCookie cookie, int page, String start, String end){
+		HttpRequest httpRequest = HttpUtil.createGet("https://yjtms.yuanfusc.com/tms/transport/arriveTrans/list.do?page="+page+"&rows=500&condition=%7B%22arrivalAdvice%22%3A1%2C%22realBeginTimeStart%22%3A%22"+start+"%2000%3A00%3A00%22%2C%22realBeginTimeEnd%22%3A%22"+end+"%2023%3A59%3A59%22%7D&sort=yjUrgentType&order=asc");
+		httpRequest.header("User-Agent","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36");
+		httpRequest.header("Referer","https://yjtms.yuanfusc.com/");
+		httpRequest.cookie(cookie.getCookie());
+		log.info("################arriveTrans: httpRequest={}",httpRequest);
+		HttpResponse httpResponse = httpRequest.execute();
+		byte[] bytes = httpResponse.bodyBytes();
+		if(Objects.isNull(bytes)){
+			for (int i = 0; i < 3; i++) {
+				httpResponse = httpRequest.execute();
+				byte[] b = httpResponse.bodyBytes();
+				if(!Objects.isNull(b)){
+					bytes = b;
+					break;
+				}
+			}
+		}
+		log.info("################arriveTrans: httpResponse={}",httpResponse);
+		ApiResponse<Tran> apiResponse = JsonUtil.toBean(bytes, new TypeReference<ApiResponse<Tran>>() {
+		});
+		httpResponse.close();
+		if (apiResponse.getCode() != 0)throw new RuntimeException(apiResponse.getMessage());
+		return apiResponse.getRows();
+	}
+
+	private List<PushScanLog> pushScanLog(RCookie cookie, int page, String start, String end){
+		HttpRequest httpRequest = HttpUtil.createGet("https://yjtms.yuanfusc.com/i-report/stockreceive/scanreceivelist.do?page="+page+"&rows=500&condition=%7B%22queryType%22%3A2%2C%22orgIds%22%3A%22fbb8dd984b164150aaac1694cce41f8f%22%2C%22receiptTimeBegin%22%3A%22"+start+"%2000%3A00%3A00%22%2C%22receiptTimeEnd%22%3A%22"+end+"%2023%3A59%3A59%22%7D");
+		httpRequest.header("User-Agent","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36");
+		httpRequest.header("Referer","https://yjtms.yuanfusc.com/");
+		httpRequest.cookie(cookie.getCookie());
+		log.info("################pushScanLog: httpRequest={}",httpRequest);
+		HttpResponse httpResponse = httpRequest.execute();
+		byte[] bytes = httpResponse.bodyBytes();
+		if(Objects.isNull(bytes)){
+			for (int i = 0; i < 3; i++) {
+				httpResponse = httpRequest.execute();
+				byte[] b = httpResponse.bodyBytes();
+				if(!Objects.isNull(b)){
+					bytes = b;
+					break;
+				}
+			}
+		}
+		log.info("################pushScanLog: httpResponse={}",httpResponse);
+		ApiResponse<PushScanLog> apiResponse = JsonUtil.toBean(bytes, new TypeReference<ApiResponse<PushScanLog>>() {
+		});
+		httpResponse.close();
+		if (apiResponse.getCode() != 0)throw new RuntimeException(apiResponse.getMessage());
+		return apiResponse.getRows();
+	}
+
+
+
+	private void swapOrga(RCookie cookie, String orgId){
+		HttpRequest httpRequest = HttpUtil.createGet("https://yjtms.yuanfusc.com/tms/system/swapOrga.do?swapOrgaId="+orgId);
+		httpRequest.header("User-Agent","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36");
+		httpRequest.header("Referer","https://yjtms.yuanfusc.com/");
+		httpRequest.cookie(cookie.getCookie());
+		HttpResponse httpResponse = httpRequest.execute();
+		ApiResponse<?> apiResponse = JsonUtil.toBean(httpResponse.bodyBytes(), new TypeReference<ApiResponse<?>>() {
+		});
+		if (apiResponse.getCode() != 0)throw new RuntimeException(apiResponse.getMessage());
+		cookie.setCookie(httpResponse.header("Set-Cookie"));
+	}
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/mapper/JinpaiArrivalOrderMapper.java

@@ -0,0 +1,9 @@
+package com.logpm.factory.jp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.factory.jp.entity.JinpaiArrivalOrderEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface JinpaiArrivalOrderMapper extends BaseMapper<JinpaiArrivalOrderEntity> {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/mapper/JinpaiOrgIdMapper.java

@@ -0,0 +1,10 @@
+package com.logpm.factory.jp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.factory.jp.entity.JinpaiOrgIdEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface JinpaiOrgIdMapper extends BaseMapper<JinpaiOrgIdEntity> {
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/mapper/JinpaiPushScanLogMapper.java

@@ -0,0 +1,9 @@
+package com.logpm.factory.jp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.factory.jp.entity.JinpaiPushScanLogEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface JinpaiPushScanLogMapper extends BaseMapper<JinpaiPushScanLogEntity> {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/service/IJinpaiArrivalOrderService.java

@@ -0,0 +1,7 @@
+package com.logpm.factory.jp.service;
+
+import com.logpm.factory.jp.entity.JinpaiArrivalOrderEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IJinpaiArrivalOrderService extends BaseService<JinpaiArrivalOrderEntity> {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/service/IJinpaiOrgIdService.java

@@ -0,0 +1,7 @@
+package com.logpm.factory.jp.service;
+
+import com.logpm.factory.jp.entity.JinpaiOrgIdEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IJinpaiOrgIdService extends BaseService<JinpaiOrgIdEntity> {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/service/IJinpaiPushScanLogService.java

@@ -0,0 +1,7 @@
+package com.logpm.factory.jp.service;
+
+import com.logpm.factory.jp.entity.JinpaiPushScanLogEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IJinpaiPushScanLogService extends BaseService<JinpaiPushScanLogEntity> {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/service/impl/JinpaiArrivalOrderServiceImpl.java

@@ -0,0 +1,15 @@
+package com.logpm.factory.jp.service.impl;
+
+import com.logpm.factory.jp.entity.JinpaiArrivalOrderEntity;
+import com.logpm.factory.jp.mapper.JinpaiArrivalOrderMapper;
+import com.logpm.factory.jp.service.IJinpaiArrivalOrderService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class JinpaiArrivalOrderServiceImpl extends BaseServiceImpl<JinpaiArrivalOrderMapper, JinpaiArrivalOrderEntity> implements IJinpaiArrivalOrderService {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/service/impl/JinpaiOrgIdServiceImpl.java

@@ -0,0 +1,15 @@
+package com.logpm.factory.jp.service.impl;
+
+import com.logpm.factory.jp.entity.JinpaiOrgIdEntity;
+import com.logpm.factory.jp.mapper.JinpaiOrgIdMapper;
+import com.logpm.factory.jp.service.IJinpaiOrgIdService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class JinpaiOrgIdServiceImpl extends BaseServiceImpl<JinpaiOrgIdMapper, JinpaiOrgIdEntity> implements IJinpaiOrgIdService {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/service/impl/JinpaiPushScanLogServiceImpl.java

@@ -0,0 +1,15 @@
+package com.logpm.factory.jp.service.impl;
+
+import com.logpm.factory.jp.entity.JinpaiPushScanLogEntity;
+import com.logpm.factory.jp.mapper.JinpaiPushScanLogMapper;
+import com.logpm.factory.jp.service.IJinpaiPushScanLogService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class JinpaiPushScanLogServiceImpl extends BaseServiceImpl<JinpaiPushScanLogMapper, JinpaiPushScanLogEntity> implements IJinpaiPushScanLogService {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/util/JsonUtil.java

@@ -0,0 +1,63 @@
+package com.logpm.factory.jp.util;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
+
+import java.io.IOException;
+
+@Slf4j
+public class JsonUtil {
+
+	private static final ObjectMapper objectMapper = new ObjectMapper();
+
+	static {
+		//允许单引号
+		objectMapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
+	}
+
+	public static <T> T toBean(byte[] bytes, Class<T> tClass) {
+		try {
+			return objectMapper.readValue(bytes, tClass);
+		} catch (IOException e) {
+			throw new CustomerException(500,"处理失败");
+		}
+	}
+
+	public static <T> T toBean(String bytes, Class<T> tClass) {
+		try {
+			return objectMapper.readValue(bytes, tClass);
+		} catch (IOException e) {
+			throw new CustomerException(500,"处理失败");
+		}
+	}
+
+	public static <T> T toBean(String bytes, TypeReference<T> valueTypeRef) {
+		try {
+			return objectMapper.readValue(bytes, valueTypeRef);
+		} catch (IOException e) {
+			throw new CustomerException(500,"处理失败");
+		}
+	}
+
+	public static <T> T toBean(byte[] bytes, TypeReference<T> valueTypeRef) {
+		try {
+			log.info("###############toBean: bytes={} valueTypeRef={}",bytes,valueTypeRef);
+			return objectMapper.readValue(bytes, valueTypeRef);
+		} catch (IOException e) {
+			throw new CustomerException(500,"处理失败");
+		}
+	}
+
+	public static String toString(Object obj) {
+		try {
+			return objectMapper.writeValueAsString(obj);
+		} catch (JsonProcessingException e) {
+			throw new CustomerException(500,"处理失败");
+		}
+	}
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java

@@ -1,7 +1,7 @@
 package com.logpm.warehouse.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import com.logpm.warehouse.service.IWarehouseTrayGoodsService;
 import com.logpm.warehouse.service.IWarehouseTrayTypeService;
@@ -48,12 +48,13 @@ public class WarehouseTrayGoodsClient implements IWarehouseTrayGoodsClient {
 
 	@Override
 	@PostMapping(GETTRAYIDLIST)
-	public List<WarehouseTrayGoodsEntity> getTrayIdList(String trayId) {
+	public List<WarehouseTrayGoodsEntity> getTrayIdList(String trayId, String trayBarCode) {
 		QueryWrapper<WarehouseTrayGoodsEntity> queryWrapper = new QueryWrapper();
 		if(trayId.contains(",")){
 			queryWrapper.in("tray_id",trayId.split(","));
 		}else{
-			queryWrapper.eq("tray_id",trayId);
+			queryWrapper.eq(ObjectUtils.isNotNull(trayId),"tray_id",trayId);
+			queryWrapper.eq(ObjectUtils.isNotNull(trayBarCode),"tray_code", trayBarCode);
 		}
 		queryWrapper.eq("association_type","3");
 		return warehouseTrayGoodsService.list(queryWrapper);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java

@@ -70,6 +70,7 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient {
 		return warehouseUpdownGoodsService.getOne(Wrappers.<WarehouseUpdownGoodsEntity>query().lambda()
 			.eq(ObjectUtils.isNotNull(updownGoodsEntity.getAllocationId()),WarehouseUpdownGoodsEntity::getAllocationId,updownGoodsEntity.getAllocationId())
 			.eq(WarehouseUpdownGoodsEntity::getAssociationValue,updownGoodsEntity.getAssociationValue())
+			.eq(WarehouseUpdownGoodsEntity::getWarehouseId,updownGoodsEntity.getWarehouseId())
 			.eq(ObjectUtils.isNotNull(updownGoodsEntity.getAssociationId()),WarehouseUpdownGoodsEntity::getAssociationId,updownGoodsEntity.getAssociationId())
 		);
 	}
@@ -78,10 +79,12 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient {
 	@PostMapping(LOCATIONSTOCKLISTINFORMATION)
 	public WarehouseUpdownGoodsEntity getLocationStockListInformation(WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity) {
 		return warehouseUpdownGoodsService.getOne(Wrappers.<WarehouseUpdownGoodsEntity>query().lambda()
-			.eq(WarehouseUpdownGoodsEntity::getAllocationId,warehouseUpdownGoodsEntity.getAllocationId())
+			.eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getAllocationId()),WarehouseUpdownGoodsEntity::getAllocationId,warehouseUpdownGoodsEntity.getAllocationId())
-			.eq(WarehouseUpdownGoodsEntity::getAssociationType,warehouseUpdownGoodsEntity.getAssociationType())
+			.eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getAssociationType()),WarehouseUpdownGoodsEntity::getAssociationType,warehouseUpdownGoodsEntity.getAssociationType())
-			.eq(WarehouseUpdownGoodsEntity::getMarketId,warehouseUpdownGoodsEntity.getMarketId())
+			.eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getMarketId()),WarehouseUpdownGoodsEntity::getMarketId,warehouseUpdownGoodsEntity.getMarketId())
-			.eq(WarehouseUpdownGoodsEntity::getIncomingBatch,warehouseUpdownGoodsEntity.getIncomingBatch())
+			.eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getAssociationId()),WarehouseUpdownGoodsEntity::getAssociationId,warehouseUpdownGoodsEntity.getAssociationId())
+			.eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getIncomingBatch()),WarehouseUpdownGoodsEntity::getIncomingBatch,warehouseUpdownGoodsEntity.getIncomingBatch())
+			.eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getWarehouseId()),WarehouseUpdownGoodsEntity::getWarehouseId,warehouseUpdownGoodsEntity.getWarehouseId())
 		);
 	}
 }