Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystemAdd.vue

@@ -52,6 +52,14 @@
               <el-form-item><el-input v-model="formobj.orgCode" clearable placeholder="" class="addinputw" /></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>财务中供应商/客户编码</span>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item><el-input v-model="formobj.suppCustCode" clearable placeholder="" class="addinputw" /></el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
     </div>
@@ -80,7 +88,8 @@ export default {
         useOrgName: '',
         useOrgSid: '',
         orgCode: '',
-        purchaseSystemName: ''
+        purchaseSystemName: '',
+        suppCustCode: ''
       },
       rules: {},
       submitdisabled: false
@@ -164,7 +173,8 @@ export default {
         useOrgName: '',
         useOrgSid: '',
         orgCode: '',
-        purchaseSystemName: ''
+        purchaseSystemName: '',
+        suppCustCode: ''
       }
       this.submitdisabled = false
       this.$refs['form_obj'].resetFields()

yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java

@@ -99,6 +99,12 @@ public class BaseGoodsSpuRest {
         return baseGoodsSpuService.selIsGoodsID(sid);
     }
 
+    @ApiOperation("根据商品类型sid查询商品类型名称")
+    @GetMapping("/selGoodsTypeBySid")
+    public ResultBean<String> selGoodsTypeBySid(@RequestParam("sid") String sid){
+        return baseGoodsSpuService.selGoodsTypeBySid(sid);
+    }
+
     @ApiOperation("根据图号和部门查询商品信息是否存在")
     @GetMapping("/selByCodeAndDept")
     ResultBean<Integer> selByCodeAndDept(@RequestParam("code") String code,@RequestParam("deptSid") String deptSid){

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java

@@ -30,4 +30,6 @@ public interface BaseGoodsSpuMapper extends BaseMapper<BaseGoodsSpu> {
     int selByCodeAndDept(@Param("code") String code,@Param("deptSid") String deptSid);
 
     List<BaseGoodsSpu> selPurchaseAssetInfo(@Param("useOrgSid") String useOrgSid,@Param("name") String name);
+
+    String selGoodsTypeBySid(@Param("sid") String sid);
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml

@@ -109,4 +109,7 @@ WHERE
             and goodsCode like concat('%',#{name},'%')
         </if>
     </select>
+    <select id="selGoodsTypeBySid" resultType="java.lang.String">
+        select goodsTypeName from base_goods_type where sid = #{sid}
+    </select>
 </mapper>

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@@ -633,4 +633,10 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
         }
         return rb.success().setData(list);
     }
+
+    public ResultBean<String> selGoodsTypeBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String typeName = baseMapper.selGoodsTypeBySid(sid);
+        return rb.success().setData(typeName);
+    }
 }

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml

@@ -14,5 +14,7 @@
         WHERE sd.goodsTypeSid = #{goodsTypeSid}
           AND sb.deptSid = #{deptSid}
           AND sb.nodeState = '已办结'
+        ORDER BY sb.createTime DESC
+            LIMIT 1
     </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -853,13 +853,15 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 //推送商品销售列表
                 //计算sku销售价
                 BigDecimal cost = BigDecimal.ZERO;//入库价
+                if (null != receiptBillDetail.getCost()) {
+                    cost = receiptBillDetail.getCost();
+                }
                 BigDecimal price = BigDecimal.ZERO;//计算后的销售价
                 BaseGoodsSpu baseGoodsSpu = baseGoodsSpuFeign.fetchEntityBySid(shelfBillGoods.getGoodsSpuSid()).getData();
                 String tjmxSid = smsPricesTrategyBillDetailFeign.selSid(baseGoodsSpu.getGoodsTypeSid(), deptSid).getData();
                 if (StringUtils.isNotBlank(tjmxSid)) {
                     List<SmsPricestrategyBillGoodstypedetailDetailsVo> data = smsPricesTrategyBillGoodsTypeDetailFeign.selByMainSid(tjmxSid).getData();
                     for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : data) {
-                        cost = receiptBillDetail.getCost();
                         if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
                             BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
                             price = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100")));
@@ -873,8 +875,13 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 smsGoodsDto.setCreateOrgSid(createOrgSid);
                 smsGoodsDto.setGoodsID(goodsID);
                 smsGoodsDto.setGoodsTypeSid(baseGoodsSpu.getGoodsTypeSid());
+                String typeName = baseGoodsSpuFeign.selGoodsTypeBySid(baseGoodsSpu.getGoodsTypeSid()).getData();
+                if (StringUtils.isNotBlank(typeName)) {
+                    smsGoodsDto.setGoodsTypeName(typeName);
+                }
                 smsGoodsDto.setSupplierSid(supplierSid);
                 smsGoodsDto.setSupplierName(supplierName);
+                smsGoodsDto.setGoodsSkuTitle(baseGoodsSpu.getGoodsName());
                 smsGoodsDto.setCost(cost.toString());
                 if (price.compareTo(BigDecimal.ZERO) != 0) {
                     smsGoodsDto.setPrice(price.toString());

yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java

@@ -1,13 +1,10 @@
 package com.yxt.wms.feign.base.basegoodspu;
 
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
-import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeignFallback;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -33,4 +30,9 @@ public interface BaseGoodsSpuFeign {
       @ApiOperation("根据图号和部门查询商品信息是否存在")
       @GetMapping("/selByCodeAndDept")
       ResultBean<Integer> selByCodeAndDept(@RequestParam("code") String code,@RequestParam("deptSid") String deptSid);
+
+      @ApiOperation("根据商品类型sid查询商品类型名称")
+      @GetMapping("/selGoodsTypeBySid")
+      public ResultBean<String> selGoodsTypeBySid(@RequestParam("sid") String sid);
+
 }