2022年9月30日12:05:27

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -834,6 +834,12 @@ public class Order extends OrderBase {
 	private int specialCheckStatus;
 
 	/**
+	 * 计划品名
+	 */
+	@ApiModelProperty(value = "计划品名")
+	private String planGoodsName;
+
+	/**
 	 * 采木云是否出库状态(app)
 	 */
 	@TableField(exist = false)

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -65,7 +65,7 @@ import java.util.List;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/auditproecess")
+@RequestMapping("NotBlank")
 @Api(value = "用户审批", tags = "审批流记录接口")
 public class AuditProecessController extends BladeController {
 

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -449,7 +449,6 @@ public class UserController {
 	 */
 	@GetMapping("/MCSelectList")
 	@ApiOperationSupport(order = 3)
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<List<User>> list() {
 		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(),"库管员"));
 	}

blade-service/trade-purchase/src/main/java/com/trade/purchase/financing/service/impl/FinancingServiceImpl.java

@@ -148,7 +148,7 @@ public class FinancingServiceImpl extends ServiceImpl<FinancingMapper, Financing
 		if (pathsActs == null || pathsActs.getIsEnable() == 2) {
 			throw new SecurityException("当前租户未查询到审批流配置");
 		} else {
-			salesFinancing.setStatus(1);
+			salesFinancing.setStatus(3);
 			baseMapper.updateById(salesFinancing);
 
 			//获取审批级次
@@ -208,7 +208,7 @@ public class FinancingServiceImpl extends ServiceImpl<FinancingMapper, Financing
 		if (financing.getStatus() == 3) {
 			throw new SecurityException("订单已审批通过请勿重复审批");
 		}
-		financing.setStatus(3);
+		financing.setStatus(5);
 		baseMapper.updateById(financing);
 		return R.success("审核通过");
 	}
@@ -219,7 +219,7 @@ public class FinancingServiceImpl extends ServiceImpl<FinancingMapper, Financing
 		if (financing == null) {
 			throw new SecurityException("审批失败");
 		}
-		financing.setStatus(2);
+		financing.setStatus(4);
 		baseMapper.updateById(financing);
 		return R.success("操作成功");
 	}

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/WoodHarvestingCloudController.java

@@ -35,10 +35,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
  * 采木云入出库控制器
@@ -188,15 +186,7 @@ public class WoodHarvestingCloudController {
 		if (itemId == null) {
 			return R.fail("缺少必要参数");
 		}
-		//出库明细删除，修改入库明细状态为在库
-		if (OrderTypeEnum.OUT_WAREHOUSING.getType().equals(type)) {
-			OrderItems orderItems = orderItemsService.getById(itemId);
-			OrderItems RKOrderItems = new OrderItems();
-			RKOrderItems.setId(orderItems.getSrcItemId());
-			RKOrderItems.setIsIssue("3");
-			orderItemsService.updateById(RKOrderItems);
-		}
-		return R.data(orderItemsService.removeByItemId(itemId));
+		return R.data(orderItemsService.removeByItemId(itemId,type));
 	}
 
 	/**
@@ -209,11 +199,11 @@ public class WoodHarvestingCloudController {
 					  @RequestParam(value = "type") String type,
 					  @RequestParam(value = "toolType", required = false) String toolType,
 					  @RequestParam(value = "status") int status,
-					  @RequestParam(value = "isIssue") String isIssue,@RequestParam(value = "scanningComparison", required = false) String scanningComparison) {
+					  @RequestParam(value = "isIssue") String isIssue, @RequestParam(value = "scanningComparison", required = false) String scanningComparison) {
 		if (id == null) {
 			return R.fail("缺少必要参数");
 		}
-		return R.data(orderService.withdraw(id, type, status, isIssue, toolType,scanningComparison));
+		return R.data(orderService.withdraw(id, type, status, isIssue, toolType, scanningComparison));
 	}
 
 	/**
@@ -415,4 +405,37 @@ public class WoodHarvestingCloudController {
 		return R.data(pages);
 	}
 
+	/**
+	 * app首页统计
+	 */
+	@GetMapping("/appIndexStatistics")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "月/周", notes = "type=month/week")
+	public R appIndexStatistics(@RequestParam(value = "type") String type) {
+		if (ObjectUtils.isNull(type)) {
+			return R.fail("缺少必要参数");
+		}
+		Map<String, Object> map = new HashMap<>();
+		BigDecimal mapRK = new BigDecimal("0");
+		BigDecimal LastMapRK = new BigDecimal("0");
+		BigDecimal mapCK = new BigDecimal("0");
+		BigDecimal LastMapCK = new BigDecimal("0");
+		if ("month".equals(type)) {
+			mapRK = orderItemsService.appIndexStatistics("month", "RK");
+			LastMapRK = orderItemsService.appIndexStatistics("lastMonth", "RK");
+			mapCK = orderItemsService.appIndexStatistics("month", "CK");
+			LastMapCK = orderItemsService.appIndexStatistics("lastMonth", "CK");
+		} else if ("week".equals(type)) {
+			mapRK = orderItemsService.appIndexStatistics("week", "RK");
+			LastMapRK = orderItemsService.appIndexStatistics("lastWeek", "RK");
+			mapCK = orderItemsService.appIndexStatistics("week", "CK");
+			LastMapCK = orderItemsService.appIndexStatistics("lastWeek", "CK");
+		}
+		map.put("currentRK", mapRK);
+		map.put("currentCK", mapCK);
+		map.put("upperRK", LastMapRK);
+		map.put("upperCK", LastMapCK);
+		return R.data(map);
+	}
+
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单明细表 Mapper 接口
@@ -54,4 +55,11 @@ public interface OrderItemsMapper extends BaseMapper<OrderItems> {
 	 * @return
 	 */
 	int updateByPId(@Param("id") Long id, @Param("status") String status);
+
+	/**
+	 * app首页统计
+	 * @param type
+	 * @return
+	 */
+	BigDecimal appIndexStatistics(@Param("type")String type,@Param("billType")String billType);
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.xml

@@ -65,15 +65,21 @@
         <result column="parts_cost" property="partsCost"/>
     </resultMap>
     <update id="submitPay" parameterType="long">
-        UPDATE business_order_items SET submit_pay = '1' WHERE pid = #{id}
+        UPDATE business_order_items
+        SET submit_pay = '1'
+        WHERE pid = #{id}
     </update>
     <update id="updateByPId">
-        UPDATE business_order_items SET is_Issue = #{status} WHERE pid = #{id}
+        UPDATE business_order_items
+        SET is_Issue = #{status}
+        WHERE pid = #{id}
     </update>
 
 
     <select id="selectOrderItemsPage" resultMap="orderItemsResultMap">
-        select * from business_order_items where is_deleted = 0
+        select *
+        from business_order_items
+        where is_deleted = 0
     </select>
 
     <select id="listOrderItem" resultType="com.trade.purchase.order.vo.OrderDTO">
@@ -104,7 +110,7 @@
         and a.is_deleted=0
         and b.is_deleted=0
         <if test="orderNo!=null and orderNo != ''">
-            and a.order_no like concat(concat('%',  #{orderNo}),'%')
+            and a.order_no like concat(concat('%', #{orderNo}),'%')
         </if>
         <if test="corpId!=null">
             and a.corp_id = #{corpId}
@@ -114,23 +120,43 @@
         </if>
     </select>
     <select id="orderNumber" resultType="BigDecimal">
-        SELECT
-            IFNULL(SUM(it.order_quantity),0) AS quantuty
-        FROM
-            business_order_items it
-        LEFT JOIN
-            business_order io
-            ON it.pid = io.id
-        WHERE
-            io.is_deleted = 0
-            AND it.is_deleted = 0
-            AND it.item_id = '123'
-            AND io.tenant_id = #{tenantId}
-            AND io.trade_type = #{tradeType}
-            AND io.bill_type = #{billType}
-            AND io.busines_date &gt;= (select adddate(now(),interval -1 day))
-            AND io.busines_date &lt;= (select NOW())
-            GROUP BY item_id
+        SELECT IFNULL(SUM(it.order_quantity), 0) AS quantuty
+        FROM business_order_items it
+                 LEFT JOIN
+             business_order io
+             ON it.pid = io.id
+        WHERE io.is_deleted = 0
+          AND it.is_deleted = 0
+          AND it.item_id = '123'
+          AND io.tenant_id = #{tenantId}
+          AND io.trade_type = #{tradeType}
+          AND io.bill_type = #{billType}
+          AND io.busines_date &gt;= (select adddate(now(), interval -1 day))
+          AND io.busines_date &lt;= (select NOW())
+        GROUP BY item_id
     </select>
+    <select id="appIndexStatistics" resultType="java.math.BigDecimal">
+            SELECT IFNULL(sum(storage_in_quantity),0) FROM business_order_items
+            WHERE is_deleted = 0 and tenant_id = '673511'
+            <if test="billType == RK">
+                and is_Issue = '3'
+            </if>
+            <if test="billType == CK">
+                and is_Issue = '7'
+            </if>
+            <if test="type == lastMonth">
+                date_format(create_time,'%Y-%m')=date_format(DATE_SUB(curdate(), INTERVAL 1 MONTH),'%Y-%m')
+            </if>
+            <if test="type == month">
+                date_format(create_time,'%Y-%m')=date_format(now(),'%Y-%m')
+            </if>
+            <if test="type == week">
+                and YEARWEEK(date_format(create_time,'%Y-%m-%d')) = YEARWEEK(now());
+            </if>
+            <if test="type == lastWeek">
+                and YEARWEEK(date_format(create_time,'%Y-%m-%d')) = YEARWEEK(now())-1;
+            </if>
+    </select>
+
 
 </mapper>

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -389,7 +389,7 @@
         bcd.cname AS corpName,
         bo.vehicle_ship_number AS vehicleShipNumber,
         bcd1.cname AS purchaser,
-        bo.morder_no AS morderNo,
+        bo.bill_no AS morderNo,
         bo.sys_no AS sysNo,
         boi.is_Issue AS status
         FROM

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/IOrderItemsService.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.vo.OrderItemsVO;
 
+import java.math.BigDecimal;
+import java.util.Map;
+
 /**
  * 订单明细表 服务类
  *
@@ -27,7 +30,7 @@ public interface IOrderItemsService extends IService<OrderItems> {
 	 * @param itemId
 	 * @return
 	 */
-    int removeByItemId(String itemId);
+    int removeByItemId(String itemId,String type);
 
 	/**
 	 * 通过pid修改状态
@@ -35,4 +38,9 @@ public interface IOrderItemsService extends IService<OrderItems> {
 	 * @return
 	 */
 	int updateByPId(Long id,String status);
+
+	/**
+	 * app首页统计
+	 */
+	BigDecimal appIndexStatistics(String type, String billType);
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderItemsServiceImpl.java

@@ -1,24 +1,20 @@
 package com.trade.purchase.order.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.trade.purchase.order.entity.Order;
 import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import com.trade.purchase.order.mapper.OrderItemsMapper;
 import com.trade.purchase.order.mapper.OrderMapper;
 import com.trade.purchase.order.service.IOrderItemsService;
-import com.trade.purchase.order.service.IOrderService;
 import com.trade.purchase.order.vo.OrderItemsVO;
 import lombok.AllArgsConstructor;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -41,60 +37,40 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 
 	/**
 	 * 删除出库明细，入库明细还原状态
+	 *
 	 * @param itemId
 	 * @return
 	 */
 	@Override
-	public int removeByItemId(String itemId) {
-		QueryWrapper<OrderItems> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("id", itemId);
-		queryWrapper.eq("tenant_id", AuthUtil.getTenantId());
-		queryWrapper.eq("is_deleted", 0);
-		OrderItems orderItems = baseMapper.selectOne(queryWrapper);
-		if (ObjectUtils.isNull(orderItems)){
-			throw new SecurityException("未查到明细信息");
-		}
-
-		Order order = orderMapper.selectById(orderItems.getPid());
-		if (ObjectUtils.isNull(order)){
-			throw new SecurityException("未查到主单据信息");
-		}
-		if (OrderTypeEnum.OUT_WAREHOUSING.getType().equals(order.getBillType())){
-			QueryWrapper<Order> orderQueryWrapper = new QueryWrapper<>();
-			orderQueryWrapper.eq("order_no", order.getOrderNo());
-			orderQueryWrapper.eq("tenant_id", AuthUtil.getTenantId());
-			orderQueryWrapper.eq("trade_type", OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType());
-			orderQueryWrapper.eq("bill_type", OrderTypeEnum.WAREHOUSING.getType());
-			orderQueryWrapper.eq("is_deleted", 0);
-
-			Order RkOrder = orderMapper.selectOne(orderQueryWrapper);
-			if (ObjectUtils.isNull(RkOrder)){
-				throw new SecurityException("未查到入库单据信息");
-			}
-			QueryWrapper<OrderItems> RkOrderItemsQueryWrapper = new QueryWrapper<>();
-			RkOrderItemsQueryWrapper.eq("pid", RkOrder.getId());
-			RkOrderItemsQueryWrapper.eq("tenant_id", AuthUtil.getTenantId());
-			RkOrderItemsQueryWrapper.eq("is_deleted", 0);
-			RkOrderItemsQueryWrapper.eq("bill_no", orderItems.getBillNo());
-			OrderItems RkOrderItems = baseMapper.selectOne(RkOrderItemsQueryWrapper);
-			if (ObjectUtils.isNotNull(RkOrderItems)) {
-				RkOrderItems.setIsIssue("1");
-				baseMapper.updateById(RkOrderItems);
-			}else{
-				throw new SecurityException("未找到入库明细信息");
-			}
+	public int removeByItemId(String itemId, String type) {
+		//出库明细删除，修改入库明细状态为在库
+		if (OrderTypeEnum.OUT_WAREHOUSING.getType().equals(type)) {
+			OrderItems orderItems = baseMapper.selectById(itemId);
+			OrderItems RKOrderItems = new OrderItems();
+			RKOrderItems.setId(orderItems.getSrcItemId());
+			RKOrderItems.setIsIssue("3");
+			baseMapper.updateById(RKOrderItems);
 		}
 		return baseMapper.deleteById(itemId);
 	}
 
 	/**
 	 * 通过pid修改状态
+	 *
 	 * @param id
 	 * @return
 	 */
 	@Override
 	public int updateByPId(Long id, String status) {
-		return baseMapper.updateByPId(id,status);
+		return baseMapper.updateByPId(id, status);
+	}
+
+	/**
+	 * app首页统计
+	 */
+	@Override
+	public BigDecimal appIndexStatistics(String type, String billType) {
+		return baseMapper.appIndexStatistics(type, billType);
 	}
 
 	/**

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -1057,8 +1057,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		baseMapper.insert(submitDto);
 		//结余数量
 		BigDecimal balanceNumber = new BigDecimal(0);
-		//结余金额
-		BigDecimal balanceMoney = new BigDecimal(0);
 		//明细品名集合
 		List<String> goodsName = new ArrayList<>();
 		//判断明细是否为空
@@ -1099,8 +1097,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderItems.setBalanceNumber(orderItems.getStorageInQuantity());
 				orderItemsMapper.insert(orderItems);
 				balanceNumber = balanceNumber.add(orderItems.getStorageInQuantity());
-				balanceMoney = balanceMoney.add(orderItems.getStorageAmount());
-				goodsName.add(orderItems.getCname());
+				goodsName.add(orderItems.getGoodsName());
 			}
 		}
 		//明细品名去重
@@ -1112,8 +1109,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		submitDto.setUpdateUser(AuthUtil.getUserId());
 		submitDto.setUpdateTime(new Date());
 		submitDto.setStorageQuantity(balanceNumber);//入库量
-		submitDto.setStorageAmount(balanceMoney);//入库金额
-		submitDto.setSpecialRemarks(goodsName.toString());//明细品名
+		submitDto.setSpecialRemarks(String.join(",", goodsName));//明细品名
 		baseMapper.updateById(submitDto);
 		return R.data(submitDto);
 	}
@@ -1133,8 +1129,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		submitDto.setTradeType(OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType());//类型
 		//结余数量
 		BigDecimal balanceNumber = new BigDecimal(0);
-		//结余金额
-		BigDecimal balanceMoney = new BigDecimal(0);
 		//明细品名集合
 		List<String> goodsName = new ArrayList<>();
 		//明细是否为空
@@ -1192,8 +1186,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderItemsMapper.insert(orderItems);
 				}
 				balanceNumber = balanceNumber.add(orderItems.getStorageInQuantity());
-				balanceMoney = balanceMoney.add(orderItems.getStorageAmount());
-				goodsName.add(orderItems.getCname());
+				goodsName.add(orderItems.getGoodsName());
 			}
 		}
 		//明细品名去重
@@ -1205,8 +1198,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		submitDto.setUpdateUser(AuthUtil.getUserId());
 		submitDto.setUpdateTime(new Date());
 		submitDto.setStorageQuantity(balanceNumber);//入库量
-		submitDto.setStorageAmount(balanceMoney);//入库金额
-		submitDto.setSpecialRemarks(goodsName.toString());//明细品名
+		submitDto.setSpecialRemarks(String.join(",", goodsName));//明细品名
 		baseMapper.updateById(submitDto);
 		return R.data(submitDto);
 	}
@@ -1249,8 +1241,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		//结余数量
 		BigDecimal balanceNumber = new BigDecimal(0);
-		//结余金额
-		BigDecimal balanceMoney = new BigDecimal(0);
 		//明细品名集合
 		List<String> goodsName = new ArrayList<>();
 
@@ -1305,7 +1295,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderItems.setCreateUserName(AuthUtil.getUserName());
 					orderItemsMapper.insert(orderItems);
 				}
-				goodsName.add(orderItems.getCname());
+				balanceNumber = balanceNumber.add(orderItems.getStorageInQuantity());
+				goodsName.add(orderItems.getGoodsName());
 			}
 		}
 		//明细品名去重
@@ -1317,8 +1308,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		submitDto.setUpdateUser(AuthUtil.getUserId());
 		submitDto.setUpdateTime(new Date());
 		submitDto.setStorageQuantity(balanceNumber);//入库量
-		submitDto.setStorageAmount(balanceMoney);//入库金额
-		submitDto.setSpecialRemarks(goodsName.toString());//明细品名
+		submitDto.setSpecialRemarks(String.join(",", goodsName));//明细品名
 		baseMapper.updateById(submitDto);
 		return R.data(submitDto);
 	}
@@ -1346,7 +1336,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//获取单据明细
 		LambdaQueryWrapper<OrderItems> orderItemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		orderItemsLambdaQueryWrapper
-			.eq(OrderItems::getGoodType, 0)
+			.eq(OrderItems::getTenantId, AuthUtil.getTenantId())
 			.eq(OrderItems::getPid, salesOrder.getId())
 			.eq(OrderItems::getIsDeleted, 0);
 		List<OrderItems> orderItems = orderItemsMapper.selectList(orderItemsLambdaQueryWrapper);
@@ -1378,7 +1368,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 			auditProecessDTO.setProcessType("盘点审批");
 
-			salesOrder.setStatus(1);
+			salesOrder.setStatus(3);
 
 			/* 出库 第一次 审批流程  */
 		} else if (OrderTypeEnum.OUT_WAREHOUSING.getType().equals(salesOrder.getBillType()) && checkFlag == 2 && order.getStatus() == 0) {
@@ -1460,71 +1450,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				order.setOrderItemsList(orderItems);
 				auditProecessDTO.setOrderQuantity(orderItems.stream().map(OrderItems::getOrderQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 				auditProecessDTO.setAmount(orderItems.stream().map(OrderItems::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-				//判断是否是入库，入库需要生成条形码，二维码
-				if (OrderTypeEnum.WAREHOUSING.getType().equals(salesOrder.getBillType())) {
-					//仓库
-					StorageType storageType = iStorageClient.getStorageType(salesOrder.getStorageId());
-					if (ObjectUtils.isNotNull(storageType)) {
-						salesOrder.setStorageName(storageType.getCname());
-					}
-					//货权人
-					R<CorpsDesc> corpsDesc = corpsDescClient.getCorpMessage(salesOrder.getPurchaserId());
-					if (corpsDesc.isSuccess()) {
-						salesOrder.setPurchaser(corpsDesc.getData().getCname());
-					}
-					//生成条形码，二维码图片
-					for (OrderItems item : orderItems) {
-						try {
-							//创建文件夹
-							File packageFile = new File("/home/minio/file/673511-bladex/upload");
-							//文件夹是否创建成功
-							if (!packageFile.getParentFile().exists()) {
-								boolean a = packageFile.mkdirs();
-								if (a) {
-									System.out.println("文件夹创建成功");
-								} else {
-									System.out.println("文件夹创建失败");
-								}
-							}
-							//创建条形码图片
-							File oneFile = new File(packageFile, item.getBillNo() + "捆包号.png");
-							oneFile.createNewFile();
-							//创建二维码图片
-							File qRCodeFile = new File(packageFile, item.getBillNo() + "货物明细.png");
-							qRCodeFile.createNewFile();
-							//生成条形码
-							String oneCode = BarCodeTest.generateCode(oneFile, item.getBillNo(), 500, 250);
-							//替换地址
-							oneCode = oneCode.replace("/home/minio", "http://121.37.83.47");
-							item.setOneCode(oneCode);
-							//获取品名
-							R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
-							//二维码数据
-							Map<String, Object> map = new HashMap<>();
-							map.put("purchaser", salesOrder.getPurchaser());
-							map.put("billNo", item.getBillNo());
-							map.put("stockTime", salesOrder.getStockTime());
-							map.put("storageName", salesOrder.getStorageName());
-							if (goodsMessage.isSuccess() && goodsMessage.getData() != null) {
-								map.put("goodsName", goodsMessage.getData().getCname());
-							}
-							map.put("balanceNumber", item.getBalanceNumber());
-							map.put("length", item.getLength());
-							map.put("thickness", item.getThickness());
-							map.put("remarks", item.getRemarks());
-							map.put("itemId", item.getId());
-							map.put("orderId", item.getPid());
-							//生成二维码
-							String qRCode = QRCodeTest.generateQRCode(qRCodeFile, JSONObject.toJSONString(map));
-							//替换地址
-							qRCode = qRCode.replace("/home/minio", "http://121.37.83.47");
-							item.setQrCode(qRCode);
-							orderItemsMapper.updateById(item);
-						} catch (IOException e) {
-							throw new SecurityException("生成码失败");
-						}
-					}
-				}
+
 			} else {
 				auditProecessDTO.setOrderQuantity(BigDecimal.ZERO);
 				auditProecessDTO.setAmount(BigDecimal.ZERO);
@@ -1677,12 +1603,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				RKOrderItems.setBalanceNumber(orderItems.getInventory());
 				RKOrderItems.setBalanceMoney(orderItems.getBalanceMoney());
 				RKOrderItems.setSurplusLoss(orderItems.getSurplusLoss());
-				if (RKOrderItems.getIsIssue().equals("6")) {
-					throw new SecurityException("捆包号：" + RKOrderItems.getBillNo() + "已出库");
+				if (orderItems.getIsIssue().equals("6")) {
+					throw new SecurityException("捆包号：" + orderItems.getBillNo() + "已出库");
 				}
 				orderItemsMapper.updateById(RKOrderItems);
 			}
-			order.setStatus(3);
+			order.setStatus(5);
 			order.setOrderStatus("审批通过");
 		}
 		baseMapper.updateById(order);
@@ -1710,7 +1636,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 			//盘点审批中
 		} else if (OrderTypeEnum.INVENTORY.getType().equals(order.getBillType())) {
-			order.setStatus(2);
+			order.setStatus(4);
 		} else {
 			throw new SecurityException("审批失败");
 		}
@@ -2041,16 +1967,87 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
-	public boolean withdraw(Long id, String type, int status, String isIssue, String toolType,String scanningComparison) {
+	public boolean withdraw(Long id, String type, int status, String isIssue, String toolType, String scanningComparison) {
 		Order order = baseMapper.selectById(id);
 		if (OrderTypeEnum.WAREHOUSING.getType().equals(type)) {
 			if ("app".equals(toolType)) {
 				if (3 == order.getStatus()) {
 					throw new SecurityException("已提交审核，撤回失败");
 				}
+				//修改明细状态
+				orderItemsService.updateByPId(id, isIssue);
+			} else {
+				//获取单据明细
+				LambdaQueryWrapper<OrderItems> orderItemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+				orderItemsLambdaQueryWrapper
+					.eq(OrderItems::getTenantId, AuthUtil.getTenantId())
+					.eq(OrderItems::getPid, order.getId())
+					.eq(OrderItems::getIsDeleted, 0);
+				List<OrderItems> orderItems = orderItemsMapper.selectList(orderItemsLambdaQueryWrapper);
+				//入库需要生成条形码，二维码
+				//仓库
+				StorageType storageType = iStorageClient.getStorageType(order.getStorageId());
+				if (ObjectUtils.isNotNull(storageType)) {
+					order.setStorageName(storageType.getCname());
+				}
+				//货权人
+				R<CorpsDesc> corpsDesc = corpsDescClient.getCorpMessage(order.getPurchaserId());
+				if (corpsDesc.isSuccess()) {
+					order.setPurchaser(corpsDesc.getData().getCname());
+				}
+				//生成条形码，二维码图片
+				for (OrderItems item : orderItems) {
+					try {
+						//创建文件夹
+						File packageFile = new File("/home/minio/file/673511-bladex/upload");
+						//文件夹是否创建成功
+						if (!packageFile.getParentFile().exists()) {
+							boolean a = packageFile.mkdirs();
+							if (a) {
+								System.out.println("文件夹创建成功");
+							} else {
+								System.out.println("文件夹创建失败");
+							}
+						}
+						//创建条形码图片
+						File oneFile = new File(packageFile, item.getBillNo() + "捆包号.png");
+						oneFile.createNewFile();
+						//创建二维码图片
+						File qRCodeFile = new File(packageFile, item.getBillNo() + "货物明细.png");
+						qRCodeFile.createNewFile();
+						//生成条形码
+						String oneCode = BarCodeTest.generateCode(oneFile, item.getBillNo(), 500, 250);
+						//替换地址
+						oneCode = oneCode.replace("/home/minio", "http://121.37.83.47");
+						item.setOneCode(oneCode);
+						//获取品名
+						R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
+						//二维码数据
+						Map<String, Object> map = new HashMap<>();
+						map.put("purchaser", order.getPurchaser());
+						map.put("billNo", item.getBillNo());
+						map.put("stockTime", order.getStockTime());
+						map.put("storageName", order.getStorageName());
+						if (goodsMessage.isSuccess() && goodsMessage.getData() != null) {
+							map.put("goodsName", goodsMessage.getData().getCname());
+						}
+						map.put("balanceNumber", item.getBalanceNumber());
+						map.put("length", item.getLength());
+						map.put("thickness", item.getThickness());
+						map.put("itemId", item.getId());
+						map.put("orderId", item.getPid());
+						//生成二维码
+						String qRCode = QRCodeTest.generateQRCode(qRCodeFile, JSONObject.toJSONString(map));
+						//替换地址
+						qRCode = qRCode.replace("/home/minio", "http://121.37.83.47");
+						item.setQrCode(qRCode);
+						item.setIsIssue(isIssue);
+						orderItemsMapper.updateById(item);
+					} catch (IOException e) {
+						throw new SecurityException("生成码失败");
+					}
+				}
 			}
-			//修改明细状态
-			orderItemsService.updateByPId(id, isIssue);
 		} else if (OrderTypeEnum.OUT_WAREHOUSING.getType().equals(type)) {
 			if ("app".equals(toolType)) {
 				if (3 == order.getStatus()) {