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

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupInfoEntity.java

@@ -46,6 +46,12 @@ public class DistributionStockupInfoEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "备货编号")
 	private Long stockupId;
+
+	/**
+	 * 备货编号
+	 */
+	@ApiModelProperty(value = "备货编号")
+	private String stockUpType;
 	/**
 	 * 预留1
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -32,7 +32,6 @@ import javax.validation.Valid;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -43,7 +42,6 @@ import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.Date;
 import java.util.Map;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -104,9 +102,9 @@ BasicdataWarehouseController extends BladeController {
 //		qw.lambda().eq(BasicdataWarehouseEntity::getDepartment, deptId);
 		IPage<BasicdataWarehouseEntity> page = warehouseService.page(Condition.getPage(query), qw);
 		//TODO  这里将仓库的行政区域放到Service中通过缓存进行陪陪结果后返回给前端
-		page.getRecords().forEach(basicdataWarehouseEntity -> {
-
-		});
+//		page.getRecords().forEach(basicdataWarehouseEntity -> {
+//
+//		});
 //		IPage<BasicdataWarehouseEntity> pages = warehouseService.page(Condition.getPage(query), Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class));
 		return R.data(page);
 	}

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml

@@ -29,15 +29,14 @@
                                  `customerName`, `customerPhone`, `customerRoad`, `systemType`, `storeNo`, `storeName`, `serialKey`, `serviceNum`,
                                  `matingCode`, `contractNum`, `leaveBehind`, `senderName`, `senderMobile`, `senderAddress`, `administrators_id`, `create_time`,`update_time`,
                                   `delete_time`, `cars_num`, `waybill_status`, `waybill_no`, `mctsTruck`, `warehouse_id`, `old_id`, `freeze`,
-                                 `delete_reason`, `delete_administrators_id`,`mctsTruckNo`,`siteName`,`siteCode`,`dealerName`,`dealerCode`)
+                                 `delete_reason`, `delete_administrators_id`)
         VALUES ( #{param.orderSelfNum}, #{param.siteName}, #{param.area}, #{param.orderTypeName}, #{param.orderClassName},#{param.type}, #{param.total}, #{param.mtdsNo},
                 #{param.firstPackName}, #{param.firstPackCode}, #{param.dealerCode}, #{param.dealerName}, #{param.dueDate},#{param.isOpai}, #{param.orderNum},
                 #{param.carrierName}, #{param.customerName},#{param.customerPhone}, #{param.customerRoad}, #{param.systemType}, #{param.storeNo}, #{param.storeName},
                 #{param.serialKey}, #{param.serviceNum},#{param.matingCode}, #{param.contractNum}, #{param.leaveBehind}, #{param.senderName},
                 #{param.senderMobile}, #{param.senderAddress}, #{param.administratorsId},NOW(),NOW(), #{param.deleteTime}, #{param.carsNum}, #{param.waybillStatus},
                 #{param.waybillNo}, #{param.mctsTruck}, #{param.warehouseId}, #{param.oldId},#{param.freeze}, #{param.deleteReason},
-                #{param.deleteAdministratorsId},
-                #{param.mctsTruckNo},   #{param.siteName},   #{param.siteCode},#{param.dealerName},#{param.dealerCode},
+                #{param.deleteAdministratorsId}
                 );
     </insert>