|
@@ -551,6 +551,7 @@ public class FsStoreOrderScrmController extends BaseController
|
|
|
/**销售出库明细单**/
|
|
/**销售出库明细单**/
|
|
|
for (int i = 0; i < orderItems.size(); i++) {
|
|
for (int i = 0; i < orderItems.size(); i++) {
|
|
|
StoreOrderProductDTO cartInfo = JSONObject.parseObject(orderItems.get(i).getJsonInfo(), StoreOrderProductDTO.class);
|
|
StoreOrderProductDTO cartInfo = JSONObject.parseObject(orderItems.get(i).getJsonInfo(), StoreOrderProductDTO.class);
|
|
|
|
|
+ logger.info("出库,carInfo:{},{}", i,orderItems.get(i).getJsonInfo());
|
|
|
setCellValue(sheet, 9, startCol + i, cartInfo.getSku());//规格(型号)
|
|
setCellValue(sheet, 9, startCol + i, cartInfo.getSku());//规格(型号)
|
|
|
setCellValue(sheet, 13, startCol + i, String.valueOf(cartInfo.getNum()));//数量
|
|
setCellValue(sheet, 13, startCol + i, String.valueOf(cartInfo.getNum()));//数量
|
|
|
setCellValue(sheet, 14, startCol + i, String.valueOf(cartInfo.getPrice()));//单价(元)
|
|
setCellValue(sheet, 14, startCol + i, String.valueOf(cartInfo.getPrice()));//单价(元)
|
|
@@ -597,6 +598,7 @@ public class FsStoreOrderScrmController extends BaseController
|
|
|
String jsonInfo = items.get(i).getJsonInfo();
|
|
String jsonInfo = items.get(i).getJsonInfo();
|
|
|
if (StringUtils.isNotEmpty(jsonInfo)) {
|
|
if (StringUtils.isNotEmpty(jsonInfo)) {
|
|
|
StoreOrderProductDTO cartInfo = JSONObject.parseObject(jsonInfo, StoreOrderProductDTO.class);
|
|
StoreOrderProductDTO cartInfo = JSONObject.parseObject(jsonInfo, StoreOrderProductDTO.class);
|
|
|
|
|
+ logger.info("退款,carInfo:{},{}", i,orderItems.get(i).getJsonInfo());
|
|
|
setCellValue(sheet, 8, startNul + i, cartInfo.getProductName());//商品名称 如果为空取通用名称,
|
|
setCellValue(sheet, 8, startNul + i, cartInfo.getProductName());//商品名称 如果为空取通用名称,
|
|
|
setCellValue(sheet, 9, startNul + i, cartInfo.getSku());//规格(型号)
|
|
setCellValue(sheet, 9, startNul + i, cartInfo.getSku());//规格(型号)
|
|
|
setCellValue(sheet, 11, startNul + i, cartInfo.getBarCode());//生产批号 / 序列号 这应该药品的追溯码一样,都是发货的时候才会上传
|
|
setCellValue(sheet, 11, startNul + i, cartInfo.getBarCode());//生产批号 / 序列号 这应该药品的追溯码一样,都是发货的时候才会上传
|