diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java index e2dff5a..928b681 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java @@ -71,7 +71,7 @@ public class OrderclusterService extends BaseService { ) { String selectsql = "select t.*, s.name supermarket_name "; String fromsql = "from ordercluster t \n" + - " left join supermarket s on s.id = t.supermarket_id \n" + + " left join supermarket s on s.id = t.supermarket_id AND s.type = 0\n" + " where t.customer_id is null \n "; List paraList = new ArrayList<>(); diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index 0199f95..fe1dccc 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -115,7 +115,7 @@ public class OrderTempService extends BaseService { List paraList = new ArrayList<>(); - if (supermarket_type != null && supermarket_type == 1) { + if (supermarket_type != null && supermarket_type == 3) { selectsql = "select t.* " + ", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" + ", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" + @@ -129,6 +129,8 @@ public class OrderTempService extends BaseService { " left join supermarket s1 on s1.id = t.supermarket_id \n" + " left join order_temp ot on t.old_sn = ot.sn \n" + " where 1=1 "; + + supermarket_type = 1; } diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductService.java index 673d685..49d0466 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductService.java @@ -24,7 +24,7 @@ public class ProductService extends BaseService { public Page find(PageParam pp, String name, Integer del, Integer type) { String selectsql = "select * "; - String fromsql = "from product t where 1=1 \n"; + String fromsql = "from product t where id != 1 \n"; List paraList = new ArrayList<>(); if (del != null && (del == Const.LOGIC_DEL_VALID || del == Const.LOGIC_DEL_INVALID)) { @@ -59,7 +59,7 @@ public class ProductService extends BaseService { } public List list( Integer type) { - String fromsql = "select * from product t where t.del = 0 "; + String fromsql = "select * from product t where t.del = 0 and id != 1"; List paraList = new ArrayList<>(); if (type != null ) { diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java index 3a24a9c..7dad25e 100644 --- a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java @@ -67,14 +67,16 @@ public class OrderTransferSyncService { // } Truck truck = Truck.dao.findById(transport.getTruckLicense()); - if (truck == null) { - return Result.failedstr("不是物流公司车辆【%s】", transport.getTruckLicense()); + TransportCompany tc = null; + if (truck != null) { +// return Result.failedstr("不是物流公司车辆【%s】", transport.getTruckLicense()); + tc = TransportCompany.dao.findById(truck.getTransCoId()); + if (tc == null) { + return Result.failedstr("车辆【%s】关联物流公司信息错误", transport.getTruckLicense()); + } } - TransportCompany tc = TransportCompany.dao.findById(truck.getTransCoId()); - if (tc == null) { - return Result.failedstr("车辆【%s】关联物流公司信息错误", transport.getTruckLicense()); - } + BigDecimal min = new BigDecimal(0.001); Date now = new Date(); @@ -147,14 +149,28 @@ public class OrderTransferSyncService { order.setCreateTime(now); // 物流公司信息 - order.setTransCoId(truck.getTransCoId()); - order.setTransCoAddress(tc.getAddress()); - order.setTransCoBankAccount(tc.getBankAccount()); - order.setTransCoBankName(tc.getBankName()); - order.setTransCoName(tc.getName()); - order.setTransCoPhone(tc.getPhone()); - order.setTransCoTexpayerName(tc.getTexpayerName()); - order.setTransCoTexpayerNum(tc.getTexpayerNum()); + + if(tc != null){ + order.setTransCoId(tc.getId()); + order.setTransCoAddress(tc.getAddress()); + order.setTransCoBankAccount(tc.getBankAccount()); + order.setTransCoBankName(tc.getBankName()); + order.setTransCoName(tc.getName()); + order.setTransCoPhone(tc.getPhone()); + order.setTransCoTexpayerName(tc.getTexpayerName()); + order.setTransCoTexpayerNum(tc.getTexpayerNum()); + + // 更新 transport 出入场信息 + transport.setTransCoId(tc.getId()); + transport.setTransCoAddress(tc.getAddress()); + transport.setTransCoBankAccount(tc.getBankAccount()); + transport.setTransCoBankName(tc.getBankName()); + transport.setTransCoName(tc.getName()); + transport.setTransCoPhone(tc.getPhone()); + transport.setTransCoTexpayerName(tc.getTexpayerName()); + transport.setTransCoTexpayerNum(tc.getTexpayerNum()); + } + BigDecimal distance = SupermarketSandfarmDistanceService.me.getDistance(transport.getSupermarketId(), sandfarm_id); order.setTransDistance(distance); // 转运运距 @@ -163,15 +179,7 @@ public class OrderTransferSyncService { // 支付时，用净重计算运费 order.setTransPrice(new BigDecimal(TransPriceService.me.caleTransferTransPrice( net_weight.doubleValue(), order.getTransDistance().doubleValue()))); // 转运运费 - // 更新 transport 出入场信息 - transport.setTransCoId(truck.getTransCoId()); - transport.setTransCoAddress(tc.getAddress()); - transport.setTransCoBankAccount(tc.getBankAccount()); - transport.setTransCoBankName(tc.getBankName()); - transport.setTransCoName(tc.getName()); - transport.setTransCoPhone(tc.getPhone()); - transport.setTransCoTexpayerName(tc.getTexpayerName()); - transport.setTransCoTexpayerNum(tc.getTexpayerNum()); + transport.setState(OrderStateEnum.RECEIVED.getStateid()); // 标记 transport state 为 5 ，表示出入场记录完成 transport.setArriveTime(now); transport.setType(OrderTypeEnum.TRANSFER.getTypeid()); @@ -191,18 +199,18 @@ public class OrderTransferSyncService { return false; } - Stock stock = Stock.dao.findByIds(transport.getSupermarketId(), product_id); - if (stock == null) { - log.error("未找到库存信息 %s, %s", order.getSupermarketId(), order.getProductId()); - return false; - } - - stock.setStockWeight(stock.getStockWeight().add(net_weight)); // 转运加库存 - ret = stock.update(); - - if (!ret) { - return false; - } +// Stock stock = Stock.dao.findByIds(transport.getSupermarketId(), product_id); +// if (stock == null) { +// log.error("未找到库存信息 %s, %s", order.getSupermarketId(), order.getProductId()); +// return false; +// } +// +// stock.setStockWeight(stock.getStockWeight().add(net_weight)); // 转运加库存 +// ret = stock.update(); +// +// if (!ret) { +// return false; +// } ret = transport.update(); @@ -240,7 +248,7 @@ public class OrderTransferSyncService { // 在这里更新sn字段之后存入 synctask.addSaveData(order); synctask.addUpdateData(transport); - synctask.addUpdateData(stock); +// synctask.addUpdateData(stock); return SyncTaskService.me.save(synctask); } catch (Exception e) {