yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

基础数据BUG修复

Browse Source
product
chuang 2 years ago
parent a10d10612a
commit c0d67332c6
13 changed files with 281 additions and 38 deletions
Show Stats Download Patch File Download Diff File

10
SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerMobileEntity.java
Unescape View File

@ -107,15 +107,15 @@ public class CustomerMobileEntity {
// @TableField("COUNTY")
// private String county;
@TableField("settlemenSum")
private BigDecimal settlemenSum;
@TableField("weightSum")
private BigDecimal weightSum;
@TableField("buckleWeightSum")
private BigDecimal buckleWeightSum;
@TableField("grossWeightSum")
private BigDecimal grossWeightSum;
@TableField("salesPriceSum")
private BigDecimal salesPriceSum;
}

13
SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java
Unescape View File

@ -120,14 +120,13 @@ public class CustomerVOServiceImpl extends ServiceImpl<CustomerVMapper, Customer
}else{
try {
String sidx = customerPagination.getSidx();
if (sidx.equals("customerLevel")){
sidx="CUSTOMER_LEVEL";
}
// CustomerEntity customerEntity = new CustomerEntity();
// Field declaredField = customerEntity.getClass().getDeclaredField(sidx);
// declaredField.setAccessible(true);
// String value = declaredField.getAnnotation(TableField.class).value();
customerQueryWrapper="asc".equals(customerPagination.getSort().toLowerCase())?customerQueryWrapper.orderByAsc(sidx):customerQueryWrapper.orderByDesc(sidx);
CustomerMobileEntity customerEntity = new CustomerMobileEntity();
Field declaredField = customerEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
customerQueryWrapper="asc".equals(customerPagination.getSort().toLowerCase())?customerQueryWrapper.orderByAsc(value):customerQueryWrapper.orderByDesc(value);
} catch (Exception e) {
e.printStackTrace();
}

9
SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java
Unescape View File

@ -114,10 +114,11 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
try {
String sidx = materialPagination.getSidx();
// MaterialEntity materialEntity = new MaterialEntity();
// Field declaredField = materialEntity.getClass().getDeclaredField(sidx);
// declaredField.setAccessible(true);
// String value = declaredField.getAnnotation(TableField.class).value();
materialQueryWrapper="asc".equals(materialPagination.getSort().toLowerCase())?materialQueryWrapper.orderByAsc(sidx):materialQueryWrapper.orderByDesc(sidx);
MaterialVoMobileEntity materialEntity = new MaterialVoMobileEntity();
Field declaredField = materialEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
materialQueryWrapper="asc".equals(materialPagination.getSort().toLowerCase())?materialQueryWrapper.orderByAsc(value):materialQueryWrapper.orderByDesc(value);
} catch (Exception e) {
e.printStackTrace();
}

22
SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java
Unescape View File

@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* messageCenter
@ -82,7 +83,7 @@ public class MessageCenterController {
* @return
*/
@PostMapping("/getMobileList")
@ApiOperation("消息列表")
@ApiOperation("获取移动端未读消息")
public ActionResult Mobilelist(@RequestBody MessageCenterPagination messageCenterPagination) throws IOException {
List<MessageCenterEntity> list = messageCenterService.getMobileList(messageCenterPagination);
List<MessageCenterListVO> listVO = JsonUtil.getJsonToList(list, MessageCenterListVO.class);
@ -92,6 +93,19 @@ public class MessageCenterController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 获取首页信息
*
* @param
* @return
*/
@GetMapping("/getHomePage")
@ApiOperation("获取首页信息")
public ActionResult getHomePage() throws IOException {
List<Map> list = messageCenterService.getHomePage();
return ActionResult.success(list);
}
/**
@ -100,11 +114,10 @@ public class MessageCenterController {
* @return
*/
@PostMapping ("/isRead")
public ActionResult<String> isRead(@RequestBody JSONObject id){
@ApiOperation("根据id更新信息状态为已读")
public ActionResult<String> isRead(@RequestBody JSONObject id){
List<String> idList = JsonUtil.getJsonToList(id.get("id"), String.class);
messageCenterService.idRead(idList);
return ActionResult.success("更改状态成功");
}
/**
@ -113,6 +126,7 @@ public class MessageCenterController {
* @return
*/
@GetMapping("/isAllRead")
@ApiOperation("更新全部未读信息状态为已读")
public ActionResult<String> isAllRead(){
messageCenterService.idALlRead();

3
SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java
Unescape View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.messageCenter.entity.MessageCenterEntity;
import java.util.List;
import java.util.Map;
/**
* messageCenter
@ -25,4 +26,6 @@ public interface MessageCenterMapper extends BaseMapper<MessageCenterEntity> {
* @return
*/
List<MessageCenterEntity> getPayMessage();
List<Map> getHomePageData();
}

2
SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java
Unescape View File

@ -34,6 +34,8 @@ public interface MessageCenterService extends IService<MessageCenterEntity> {
void idALlRead();
List<Map> getHomePage();
// 子表方法
//列表子表数据方法

10
SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java
Unescape View File

@ -18,9 +18,11 @@ import jnpf.util.UserProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* messageCenter
@ -39,6 +41,9 @@ public class MessageCenterServiceImpl extends ServiceImpl<MessageCenterMapper, M
@Autowired
private AuthorizeService authorizeService;
@Resource
private MessageCenterMapper messageCenterMapper;
@Override
public List<MessageCenterEntity> getList(MessageCenterPagination messageCenterPagination) {
@ -336,6 +341,11 @@ public class MessageCenterServiceImpl extends ServiceImpl<MessageCenterMapper, M
}
}
@Override
public List<Map> getHomePage() {
return messageCenterMapper.getHomePageData();
}
@Override
public void delete(MessageCenterEntity entity) {
if (entity != null) {

136
SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupperlierMobileEntitySidex.java
Unescape View File

@ -0,0 +1,136 @@
package jnpf.supplier.model.supplier;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author: WangChuang
* @Date: 21/3/2023 上午8:44
* @Description //注释：
* @Version 1.0
*/
@Data
public class SupperlierMobileEntitySidex {
@TableId("ID")
private String id;
@TableField("CREATOR_USER_ID")
private String creatorUserId;
@TableField("CREATOR_USER_NAME")
private String creatorUserName;
@TableField("CREATOR_TIME")
private Date creatorTime;
@TableField("LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("LAST_MODIFY_USER_NAME")
private String lastModifyUserName;
@TableField("LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("DELETE_USER_ID")
private String deleteUserId;
@TableField("DELETE_USER_NAME")
private String deleteUserName;
@TableField("DELETE_TIME")
private Date deleteTime;
@TableField("DELETE_MARK")
private String deleteMark;
@TableField("SUPPLIER_CODE")
private String supplierCode;
@TableField("SUPPLIER_NAME")
private String supplierName;
@TableField("SUPPLIER_SITE_ID")
private String supplierSiteId;
@TableField("SUPPLIER_SITE_CODE")
private String supplierSiteCode;
@TableField("COMPANY_ID")
private String companyId;
@TableField("VAT_REGISTRATION_NUM")
private String vatRegistrationNum;
@TableField("ORGNIZE_ID")
private String orgnizeId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("SUPPLY")
private Integer supply;
@TableField("CONTACT_NAME")
private String contactName;
@TableField("CONTACT_PHONE")
private String contactPhone;
@TableField("SUPPLIER_LEVEL")
private String supplierLevel;
@TableField("ADDRESS")
private String address;
@TableField("STATUS")
private String status;
@TableField("COUNTRY")
private String country;
@TableField("PROVINCE")
private String province;
@TableField("CLASSIFICATION")
private String classification;
@TableField("ENTERPRISE")
private String enterprise;
@TableField("BANK")
private String bank;
@TableField("BANK_ACCOUNT")
private String bankAccount;
@TableField("TAX_CODE")
private String taxCode;
@TableField("PAYABLE")
private String payable;
@TableField("PREPAID")
private String prepaid;
@TableField("IS_PURCHASE")
private String isPurchase;
@TableField("IS_PAYMENT")
private String isPayment;
@TableField("settlemenSum")
private BigDecimal settlemenSum;
@TableField("weightSum")
private BigDecimal weightSum;
@TableField("buckleWeightSum")
private BigDecimal buckleWeightSum;
@TableField("grossWeightSum")
private BigDecimal grossWeightSum;
@TableField("salesPriceSum")
private BigDecimal salesPriceSum;
}

20
SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java
Unescape View File

@ -12,6 +12,7 @@ import jnpf.permission.service.AuthorizeService;
import jnpf.supplier.entity.SupplierEntity;
import jnpf.supplier.entity.SupplierMobileEntity;
import jnpf.supplier.mapper.SupplierMapper;
import jnpf.supplier.model.supplier.SupperlierMobileEntitySidex;
import jnpf.supplier.model.supplier.SupplierPagination;
import jnpf.supplier.service.SupplierService;
import jnpf.util.ServletUtil;
@ -116,18 +117,13 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
}else{
try {
String sidx = supplierPagination.getSidx();
switch (sidx){
case "supplierLevel":
sidx="SUPPLIER_LEVEL";
break;
default:
break;
}
SupplierEntity supplierEntity = new SupplierEntity();
// Field declaredField = supplierEntity.getClass().getDeclaredField(sidx);
// declaredField.setAccessible(true);
// String value = declaredField.getAnnotation(TableField.class).value();
supplierQueryWrapper="asc".equals(supplierPagination.getSort().toLowerCase())?supplierQueryWrapper.orderByAsc(sidx):supplierQueryWrapper.orderByDesc(sidx);
// SupplierEntity supplierEntity = new SupplierEntity();
SupperlierMobileEntitySidex supplierEntity = new SupperlierMobileEntitySidex();
Field declaredField = supplierEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
supplierQueryWrapper="asc".equals(supplierPagination.getSort().toLowerCase())?supplierQueryWrapper.orderByAsc(value):supplierQueryWrapper.orderByDesc(value);
} catch (Exception e) {
e.printStackTrace();
}

5
SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleMobileEntity.java
Unescape View File

@ -65,7 +65,10 @@ public class VehicleMobileEntity {
@TableField("CONTACT")
private String contact;
// 运输总次数
@TableField("licenseCount")
private Integer licenseCount;
// 运输总量
// 运输总量
@TableField("licenseSum")
private Integer licenseSum;
}

9
SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java
Unescape View File

@ -116,10 +116,11 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
try {
String sidx = vehiclePagination.getSidx();
// VehicleEntity vehicleEntity = new VehicleEntity();
// Field declaredField = vehicleEntity.getClass().getDeclaredField(sidx);
// declaredField.setAccessible(true);
// String value = declaredField.getAnnotation(TableField.class).value();
vehicleQueryWrapper="asc".equals(vehiclePagination.getSort().toLowerCase())?vehicleQueryWrapper.orderByAsc(sidx):vehicleQueryWrapper.orderByDesc(sidx);
VehicleMobileEntity vehicleEntity = new VehicleMobileEntity();
Field declaredField = vehicleEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
vehicleQueryWrapper="asc".equals(vehiclePagination.getSort().toLowerCase())?vehicleQueryWrapper.orderByAsc(value):vehicleQueryWrapper.orderByDesc(value);
} catch (Exception e) {
e.printStackTrace();
}

78
SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
Unescape View File

@ -99,4 +99,82 @@
AND ! ISNULL( a.businessdate )
) aaa
</select>
<resultMap id="getHomePageDataMap" type="map">
<!--采购平均价-->
<result property="avgPurchasePrice" column="avgPurchasePrice"/>
<!--今日采购量-->
<result property="todayPurchasePrice" column="todayPurchasePrice"/>
<!--今日销售量-->
<result property="salesVolumeToday" column="salesVolumeToday"/>
<!--待支付-->
<result property="unpaid" column="unpaid"/>
<!--今日付款-->
<result property="todayPay" column="todayPay"/>
<!--待回款-->
<result property="moneyCollected" column="moneyCollected"/>
<!--今日回款-->
<result property="todayPayment" column="todayPayment"/>
</resultMap>
<select id="getHomePageData" resultMap="getHomePageDataMap">
SELECT
*
FROM
(
SELECT
ROUND( IFNULL( AVG( IFNULL( a.purchase_price, 0 )), 0 ), 6 ) avgPurchasePrice,
ROUND( IFNULL( SUM( IFNULL( a.settlement, 0 )), 0 ), 6 ) todayPurchasePrice
FROM
jg_poundlist a
WHERE
TO_DAYS( now() ) - TO_DAYS( a.input_date )= 0
AND a.delete_mark = '0'
) a,(
SELECT
ROUND( IFNULL( SUM( IFNULL( a.settlement, 0 )), 0 ), 6 ) salesVolumeToday
FROM
jg_poundlist a
WHERE
TO_DAYS( now() ) - TO_DAYS( a.output_date )= 0
AND a.delete_mark = '0'
) b,(
SELECT
ROUND( IFNULL( SUM( IFNULL( a.amount, 0 )- IFNULL( a.pay_price, 0 )), 0 ), 6 ) unpaid
FROM
jg_purchaseorder a
WHERE
a.`STATUS` = '2'
AND a.pay_price &lt; a.amount
AND a.delete_mark = '0'
) c,(
SELECT
ROUND( IFNULL( SUM( IFNULL( a.paymentamount, 0 )), 0 ), 6 ) todayPay
FROM
jg_payment a
WHERE
TO_DAYS( now() ) - TO_DAYS( a.businessdate )= 0
AND ( a.`STATUS` = 1 OR a.`STATUS` = '2' )
AND a.delete_mark = '0'
) d,(
SELECT
ROUND( IFNULL( SUM( IFNULL( a.price, 0 )- IFNULL( a.amount_collected, 0 )), 0 ), 6 ) moneyCollected
FROM
jg_salesorder a
WHERE
a.`STATUS` = '2'
AND a.amount_collected &lt; a.price
AND a.delete_mark = '0'
) e,(
SELECT
ROUND( IFNULL( SUM( IFNULL( a.amount_collected, 0 )), 0 ), 6 ) todayPayment
FROM
jg_collection a
WHERE
TO_DAYS( now() ) - TO_DAYS( a.business_date )= 0
AND ( a.`STATUS` = 1 OR a.`STATUS` = '2' )
AND a.delete_mark = '0'
) f
</select>
</mapper>

2
SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml
Unescape View File

@ -74,7 +74,7 @@
c.id
ORDER BY
a.id
) aaa
) aaa ${ew.customSqlSegment}
</select>
<resultMap id="getWareHouseMobileDateMap" type="jnpf.warehouse.model.warehouse.MobileWareHouseVO">

Write Preview
Loading…
Cancel
Save